diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index c70e4493..857ef9d7 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 2964d426..44ffedc5 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/advanced/dynamic-ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java b/advanced/dynamic-ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java index f9013df8..736f3d0b 100644 --- a/advanced/dynamic-ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java +++ b/advanced/dynamic-ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java @@ -53,7 +53,8 @@ public class FtpOutboundChannelAdapterSample { } catch (MessagingException e) { assertThat(e.getCause().getCause().getCause(), instanceOf(UnknownHostException.class)); - assertTrue(e.getCause().getCause().getCause().getMessage().startsWith("host.for.cust1")); + System.out.println(e.getCause().getCause().getCause().getMessage()); + assertTrue(e.getCause().getCause().getCause().getMessage().contains("host.for.cust1")); } // send another so we can see in the log we don't create the ac again. try { @@ -61,7 +62,7 @@ public class FtpOutboundChannelAdapterSample { } catch (MessagingException e) { assertThat(e.getCause().getCause().getCause(), instanceOf(UnknownHostException.class)); - assertTrue(e.getCause().getCause().getCause().getMessage().startsWith("host.for.cust1")); + assertTrue(e.getCause().getCause().getCause().getMessage().contains("host.for.cust1")); } // send to a different customer; again, check the log to see a new ac is built message = MessageBuilder.withPayload(file) @@ -71,7 +72,7 @@ public class FtpOutboundChannelAdapterSample { } catch (MessagingException e) { assertThat(e.getCause().getCause().getCause(), instanceOf(UnknownHostException.class)); - assertTrue(e.getCause().getCause().getCause().getMessage().startsWith("host.for.cust2")); + assertTrue(e.getCause().getCause().getCause().getMessage().contains("host.for.cust2")); } // send to a different customer; again, check the log to see a new ac is built @@ -83,7 +84,7 @@ public class FtpOutboundChannelAdapterSample { } catch (MessagingException e) { assertThat(e.getCause().getCause().getCause(), instanceOf(UnknownHostException.class)); - assertTrue(e.getCause().getCause().getCause().getMessage().startsWith("host.for.cust3")); + assertTrue(e.getCause().getCause().getCause().getMessage().contains("host.for.cust3")); } //send to cust1 again, since this one has been invalidated before, we should @@ -95,7 +96,7 @@ public class FtpOutboundChannelAdapterSample { } catch (MessagingException e) { assertThat(e.getCause().getCause().getCause(), instanceOf(UnknownHostException.class)); - assertEquals("host.for.cust1", e.getCause().getCause().getCause().getMessage()); + assertTrue(e.getCause().getCause().getCause().getMessage().contains("host.for.cust1")); } ctx.close(); diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 442ec8b9..d4415c41 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 94a208ce..12204755 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -121,7 +121,7 @@ org.codehaus.groovy groovy-all - 3.0.5 + 3.0.7 compile @@ -222,14 +222,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index da15e7f2..e8577e01 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 9fb4c3cf..9cf635f8 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -205,14 +205,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 35e5cc12..5a5efac3 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 8acb0118..02161ed2 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -240,14 +240,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index c1a06ae4..bcfc12be 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index fda4745e..ccdd2cc4 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -297,7 +297,7 @@ org.hibernate hibernate-entitymanager - 5.4.20.Final + 5.4.25.Final compile @@ -446,14 +446,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index e562f6ad..39b348a8 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -205,14 +205,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index c09b3ec7..17703463 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 6a3082e3..057fc0e4 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -216,14 +216,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 9155581f..637876c4 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 8e6776ed..b7787681 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 8985789b..3824e2ad 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 54f7bf02..67b9ef11 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 0a0d744a..e7f92544 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -201,14 +201,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index cb4c7239..d77be75b 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index f02b2609..ae5ed5ac 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -223,14 +223,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 914d2ef0..6d88da2b 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index e628a53f..1cc85ca4 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -204,14 +204,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index cfe68d87..1d994aa6 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index f6297e1c..ac8bd89a 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -218,14 +218,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index a6e9cbc1..72fde458 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -210,14 +210,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 0edc8b1c..e9a75065 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -188,14 +188,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 4ec19d67..e5fa3836 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -76,7 +76,7 @@ org.mongodb mongodb-driver-sync - 4.1.0 + 4.1.1 compile @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 6c410fa0..7496b3ea 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 808202b2..9991975f 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 8adb1821..029ca30c 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 12108a61..cb1e520b 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/splunk/pom.xml b/basic/splunk/pom.xml index d2138311..c8bac927 100644 --- a/basic/splunk/pom.xml +++ b/basic/splunk/pom.xml @@ -195,14 +195,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index eeb02288..207890c6 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -188,14 +188,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index a396edff..31900cb9 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 7877e948..dbd80693 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 309592ed..5b4b7f7d 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index af64871a..4b3c09cf 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -186,14 +186,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 36566563..70632a2d 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -154,14 +154,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 2bdc4d2f..740603ca 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index a9e00787..e4ae3281 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -175,14 +175,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index faee000d..66b94849 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 83633b87..901c0bed 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 85bcc7ee..6e0e84e4 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/build.gradle b/build.gradle index eef9e324..4090f079 100644 --- a/build.gradle +++ b/build.gradle @@ -180,16 +180,17 @@ subprojects { subproject -> c3p0Version = '0.9.1.2' derbyVersion = '10.14.2.0' hamcrestVersion = '2.2' - hibernateVersion = '5.4.20.Final' + hibernateVersion = '5.4.25.Final' hibernateValidatorVersion = '6.1.2.Final' ftpServerVersion = '1.1.1' flexjsonVersion = '2.0' - groovyVersion = '3.0.5' + groovyVersion = '3.0.7' hsqldbVersion = '2.5.1' h2Version = '1.4.200' jacksonVersion = '2.11.1' javaxInjectVersion = '1' javaxMailVersion = '1.6.2' + jaxbVersion = '2.3.3' jodaTimeVersion = '1.6' jtaVersion = '1.1' jtdsVersion = '1.2.6' @@ -202,18 +203,18 @@ subprojects { subproject -> jythonVersion = '2.7.2' log4jVersion = '2.13.3' mockitoVersion = '3.4.6' - mongoDriverVersion = '4.1.0' + mongoDriverVersion = '4.1.1' openJpaVersion = '2.4.0' oracleDriverVersion = '11.2.0.3' postgresVersion = '42.2.14' subethasmtpVersion = '1.2' slf4jVersion = '1.7.25' springCloudVersion ='2020.0.0-SNAPSHOT' - springIntegrationVersion = '5.4.1' + springIntegrationVersion = '5.4.2' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springVersion = '5.3.1' - springSecurityVersion = '5.4.1' + springVersion = '5.3.2' + springSecurityVersion = '5.4.2' springWebFlowVersion = '2.3.3.RELEASE' testcontainersVersion = '1.13.0' tilesJspVersion = '2.2.1' @@ -1160,6 +1161,7 @@ project('rest-http') { compile "org.springframework.security:spring-security-web:$springSecurityVersion" compile "org.springframework.security:spring-security-config:$springSecurityVersion" compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + compile "com.sun.xml.bind:jaxb-impl:$jaxbVersion" } test { diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 8aeae205..c8139c0f 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -195,14 +195,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index e3329929..d453295e 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -206,14 +206,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/dsl/pom.xml b/dsl/pom.xml index f1344f27..6894af15 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -128,14 +128,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 1052e83a..8f234d38 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -264,14 +264,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 830a9bbe..5e97d871 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 0e4abc24..2696c072 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 3fb0193a..ce42997e 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 44dc806a..f57bdb02 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index d6617a66..65768e8d 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -212,14 +212,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 44f8c073..61ed9c6d 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -199,14 +199,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 73d227cc..d9993fea 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -199,14 +199,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 40b98fb0..b83d7b42 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -141,7 +141,7 @@ org.springframework.security spring-security-web - 5.4.1 + 5.4.2 compile @@ -153,7 +153,7 @@ org.springframework.security spring-security-config - 5.4.1 + 5.4.2 compile @@ -174,6 +174,18 @@ + + com.sun.xml.bind + jaxb-impl + 2.3.3 + compile + + + jackson-module-kotlin + com.fasterxml.jackson.module + + + junit junit @@ -254,14 +266,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index c6bed0ec..fb220108 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -186,14 +186,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 0320a3c2..7d7ade55 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index e5f22fdc..935733ee 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index f2515a6a..c03ed3d8 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -177,14 +177,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index a892ecb0..28698fd5 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index ba4eee11..bb1d9e69 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -189,14 +189,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index 7cd35709..a46f6000 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 5da8cb02..3b556e6f 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index 4047649d..2807cc35 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -251,14 +251,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 6908abc8..3fa60170 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -175,14 +175,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 06a1236f..a269184c 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom