From 85fa429a11c868fd0e31c87af69d6c88fc137222 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Thu, 18 Feb 2021 11:56:46 -0500 Subject: [PATCH] Upgrade dependencies including Gradle * Some Gradle script clean up * disable Splunk sample since there is no `splunk` artifact in any reasonable repository --- advanced/advanced-testing-examples/pom.xml | 12 +- advanced/dynamic-ftp/pom.xml | 12 +- advanced/dynamic-tcp-client/pom.xml | 14 +- applications/cafe-scripted/pom.xml | 14 +- applications/cafe/cafe-amqp/pom.xml | 12 +- applications/cafe/cafe-jms/pom.xml | 16 +- applications/cafe/cafe-si/pom.xml | 12 +- applications/file-split-ftp/pom.xml | 36 +- applications/loan-broker/pom.xml | 12 +- applications/loanshark/pom.xml | 22 +- applications/stomp-chat/pom.xml | 14 +- basic/amqp/pom.xml | 14 +- basic/barrier/pom.xml | 14 +- basic/control-bus/pom.xml | 12 +- basic/enricher/pom.xml | 12 +- basic/feed/pom.xml | 12 +- basic/file/pom.xml | 12 +- basic/ftp/pom.xml | 18 +- basic/helloworld/pom.xml | 12 +- basic/http/pom.xml | 36 +- basic/jdbc/pom.xml | 12 +- basic/jms/pom.xml | 16 +- basic/jmx/pom.xml | 12 +- basic/jpa/pom.xml | 14 +- basic/kafka/pom.xml | 16 +- basic/mail/pom.xml | 34 +- basic/mongodb/pom.xml | 14 +- basic/mqtt/pom.xml | 14 +- basic/oddeven/pom.xml | 12 +- basic/quote/pom.xml | 12 +- basic/sftp/pom.xml | 12 +- basic/tcp-amqp/pom.xml | 16 +- basic/tcp-broadcast/pom.xml | 14 +- basic/tcp-client-server/pom.xml | 12 +- basic/tcp-with-headers/pom.xml | 14 +- basic/testing-examples/pom.xml | 12 +- basic/twitter/pom.xml | 12 +- basic/web-sockets/pom.xml | 14 +- basic/ws-inbound-gateway/pom.xml | 12 +- basic/ws-outbound-gateway/pom.xml | 12 +- basic/xml/pom.xml | 12 +- basic/xmpp/pom.xml | 12 +- build.gradle | 372 +++++++++--------- dsl/cafe-dsl/pom.xml | 14 +- dsl/kafka-dsl/pom.xml | 16 +- dsl/pom.xml | 10 +- dsl/si4demo/pom.xml | 36 +- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 58910 -> 59203 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 2 +- gradlew.bat | 21 +- intermediate/async-gateway/pom.xml | 12 +- intermediate/dynamic-poller/pom.xml | 12 +- intermediate/errorhandling/pom.xml | 12 +- intermediate/file-processing/pom.xml | 12 +- intermediate/mail-attachments/pom.xml | 36 +- intermediate/monitoring/pom.xml | 12 +- intermediate/multipart-http/pom.xml | 14 +- intermediate/rest-http/pom.xml | 16 +- intermediate/retry-and-more/pom.xml | 12 +- .../splitter-aggregator-reaper/pom.xml | 12 +- intermediate/stored-procedures-derby/pom.xml | 12 +- intermediate/stored-procedures-ms/pom.xml | 12 +- intermediate/stored-procedures-oracle/pom.xml | 24 +- .../stored-procedures-postgresql/pom.xml | 14 +- intermediate/tcp-async-bi-directional/pom.xml | 14 +- .../tcp-client-server-multiplex/pom.xml | 12 +- intermediate/testcontainers-rabbitmq/pom.xml | 16 +- intermediate/travel/pom.xml | 12 +- intermediate/tx-synch/pom.xml | 12 +- settings.gradle | 2 +- 72 files changed, 722 insertions(+), 661 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 5ab6f8db..950b68a7 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -87,7 +87,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -99,7 +99,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -127,7 +127,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -169,21 +169,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index fe5a951a..0f591b91 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -76,7 +76,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -146,21 +146,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 05f28fe7..b7451b6b 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.springframework.integration.samples dynamic-tcp-client @@ -80,7 +80,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -108,7 +108,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -169,28 +169,28 @@ org.springframework.boot spring-boot-dependencies - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT import pom com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 507a8984..32b2a748 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -97,7 +97,7 @@ org.jruby jruby-complete - 9.2.13.0 + 9.2.14.0 compile @@ -133,7 +133,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -145,7 +145,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -173,7 +173,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -215,21 +215,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index d17338d8..e89f0792 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -76,7 +76,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -88,7 +88,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -116,7 +116,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -158,21 +158,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index f89c7d0c..3aaf6e30 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -65,7 +65,7 @@ org.apache.activemq activemq-broker - 5.16.0 + 5.16.1 compile @@ -77,7 +77,7 @@ org.apache.activemq activemq-kahadb-store - 5.16.0 + 5.16.1 compile @@ -116,7 +116,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -128,7 +128,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -156,7 +156,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -198,21 +198,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 8dd866de..cb0d7cbe 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -75,7 +75,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -87,7 +87,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -115,7 +115,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -157,21 +157,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 31ddd3bc..e9ca07be 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.springframework.integration.samples file-split-ftp @@ -111,9 +111,9 @@ - javax.mail - javax.mail-api - 1.6.2 + jakarta.mail + jakarta.mail-api + 1.6.5 compile @@ -124,8 +124,20 @@ com.sun.mail - javax.mail - 1.6.2 + imap + 1.6.5 + compile + + + jackson-module-kotlin + com.fasterxml.jackson.module + + + + + com.sun.mail + jakarta.mail + 1.6.5 compile @@ -137,7 +149,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -165,7 +177,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -226,28 +238,28 @@ org.springframework.boot spring-boot-dependencies - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT import pom com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 6371bac0..3018db5d 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -76,7 +76,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -146,21 +146,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 6de92100..e13ffdd4 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -165,7 +165,7 @@ org.apache.commons commons-dbcp2 - 2.7.0 + 2.8.0 compile @@ -297,7 +297,7 @@ org.hibernate hibernate-entitymanager - 5.4.25.Final + 5.4.28.Final compile @@ -321,7 +321,7 @@ org.slf4j slf4j-api - 1.7.25 + 1.7.30 compile @@ -333,7 +333,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 runtime @@ -345,7 +345,7 @@ org.slf4j slf4j-log4j12 - 1.7.25 + 1.7.30 runtime @@ -357,7 +357,7 @@ org.slf4j jcl-over-slf4j - 1.7.25 + 1.7.30 runtime @@ -369,7 +369,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -397,7 +397,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -439,21 +439,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 02f53d6b..417a1f5d 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.springframework.integration.samples stomp-chat @@ -102,7 +102,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -130,7 +130,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -191,28 +191,28 @@ org.springframework.boot spring-boot-dependencies - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT import pom com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 306f47ec..3405b6b5 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -75,7 +75,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -87,7 +87,7 @@ org.slf4j slf4j-jcl - 1.7.25 + 1.7.30 runtime @@ -99,7 +99,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -127,7 +127,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -169,21 +169,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index bd8cafb4..4d16376a 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.springframework.integration.samples barrier @@ -113,7 +113,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -141,7 +141,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -202,28 +202,28 @@ org.springframework.boot spring-boot-dependencies - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT import pom com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 721963a0..a048be5d 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -76,7 +76,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -146,21 +146,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 5449d134..ada8abef 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -76,7 +76,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -88,7 +88,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -116,7 +116,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -158,21 +158,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 90f2a467..84a84d55 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -76,7 +76,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -146,21 +146,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 40b8fcd2..8ad5f4b7 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -76,7 +76,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -146,21 +146,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 06028e7a..ffbe961c 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -64,7 +64,7 @@ commons-io commons-io - 2.7 + 2.8.0 compile @@ -88,7 +88,7 @@ org.slf4j slf4j-api - 1.7.25 + 1.7.30 compile @@ -100,7 +100,7 @@ org.slf4j slf4j-log4j12 - 1.7.25 + 1.7.30 runtime @@ -112,7 +112,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -140,7 +140,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -167,7 +167,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 test @@ -194,21 +194,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 388065b0..2e3579e2 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -76,7 +76,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -146,21 +146,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 3f58b950..816d5d93 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -98,7 +98,7 @@ commons-io commons-io - 2.7 + 2.8.0 compile @@ -108,9 +108,9 @@ - javax.mail - javax.mail-api - 1.6.2 + jakarta.mail + jakarta.mail-api + 1.6.5 compile @@ -121,8 +121,20 @@ com.sun.mail - javax.mail - 1.6.2 + imap + 1.6.5 + compile + + + jackson-module-kotlin + com.fasterxml.jackson.module + + + + + com.sun.mail + jakarta.mail + 1.6.5 compile @@ -134,7 +146,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -146,7 +158,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -174,7 +186,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -216,21 +228,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 9cfa047b..1574f2ef 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -76,7 +76,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -88,7 +88,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -116,7 +116,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -158,21 +158,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index c1c8340a..603e9725 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -87,7 +87,7 @@ org.apache.activemq activemq-broker - 5.16.0 + 5.16.1 compile @@ -99,7 +99,7 @@ org.apache.activemq activemq-kahadb-store - 5.16.0 + 5.16.1 compile @@ -115,7 +115,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -127,7 +127,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -155,7 +155,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -197,21 +197,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 6aec6cf6..20aa3d90 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -75,7 +75,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -87,7 +87,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -115,7 +115,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -157,21 +157,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index b3e8265b..be2d604e 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.springframework.integration.samples jpa @@ -115,7 +115,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -143,7 +143,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -204,28 +204,28 @@ org.springframework.boot spring-boot-dependencies - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT import pom com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index ac489d72..ba0b58cd 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.springframework.integration.samples kafka @@ -95,7 +95,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -107,7 +107,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -135,7 +135,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -196,28 +196,28 @@ org.springframework.boot spring-boot-dependencies - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT import pom com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 4d313a34..0d107a0c 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -73,9 +73,9 @@ - javax.mail - javax.mail-api - 1.6.2 + jakarta.mail + jakarta.mail-api + 1.6.5 compile @@ -86,8 +86,20 @@ com.sun.mail - javax.mail - 1.6.2 + imap + 1.6.5 + compile + + + jackson-module-kotlin + com.fasterxml.jackson.module + + + + + com.sun.mail + jakarta.mail + 1.6.5 compile @@ -99,7 +111,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -111,7 +123,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -139,7 +151,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -181,21 +193,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 2423351e..9823a02e 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -76,7 +76,7 @@ org.mongodb mongodb-driver-sync - 4.1.1 + 4.2.0 compile @@ -88,7 +88,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -116,7 +116,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -158,21 +158,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 34792023..d890c6bc 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.springframework.integration.samples mqtt @@ -91,7 +91,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -119,7 +119,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -180,28 +180,28 @@ org.springframework.boot spring-boot-dependencies - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT import pom com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 0aa268e9..f6e3085b 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -76,7 +76,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -146,21 +146,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 02fa3aa6..dac55335 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -76,7 +76,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -146,21 +146,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 845bcbe8..0ffb1fdd 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -76,7 +76,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -158,21 +158,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 37b61350..e6b903c7 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -75,7 +75,7 @@ org.slf4j slf4j-api - 1.7.25 + 1.7.30 compile @@ -87,7 +87,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 runtime @@ -99,7 +99,7 @@ org.slf4j slf4j-log4j12 - 1.7.25 + 1.7.30 runtime @@ -111,7 +111,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -139,7 +139,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -181,21 +181,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index a7cdeffc..a0a18cf9 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.springframework.integration.samples tcp-broadcast @@ -91,7 +91,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -119,7 +119,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -180,28 +180,28 @@ org.springframework.boot spring-boot-dependencies - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT import pom com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 9e7c3896..6521c299 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -87,7 +87,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -99,7 +99,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -127,7 +127,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -158,21 +158,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 133df3ce..8b045c40 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.springframework.integration.samples tcp-with-headers @@ -91,7 +91,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -119,7 +119,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -180,28 +180,28 @@ org.springframework.boot spring-boot-dependencies - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT import pom com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 01bd3023..dd8d366a 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -97,7 +97,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -109,7 +109,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -137,7 +137,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -179,21 +179,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 227c107c..6f6d6521 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -65,7 +65,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -77,7 +77,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -105,7 +105,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -147,21 +147,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 8395f210..3e547b1d 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.springframework.integration.samples web-sockets @@ -80,7 +80,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -108,7 +108,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -169,28 +169,28 @@ org.springframework.boot spring-boot-dependencies - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT import pom com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index b3566448..1bcf1734 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -86,7 +86,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -98,7 +98,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -126,7 +126,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -168,21 +168,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 4f3ad420..3f9c9e77 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -75,7 +75,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -87,7 +87,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -115,7 +115,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -157,21 +157,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 5dbe2923..576c8782 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -76,7 +76,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -146,21 +146,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index c8f142a9..dcd91d65 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -76,7 +76,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -146,21 +146,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/build.gradle b/build.gradle index ee7a157a..9028994d 100644 --- a/build.gradle +++ b/build.gradle @@ -5,13 +5,13 @@ buildscript { maven { url 'https://repo.spring.io/libs-snapshot' } } dependencies { - classpath 'io.spring.gradle:dependency-management-plugin:1.0.10.RELEASE' + classpath 'io.spring.gradle:dependency-management-plugin:1.0.11.RELEASE' classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion" - classpath "gradle.plugin.org.gretty:gretty:2.3.1" + classpath 'gradle.plugin.org.gretty:gretty:2.3.1' } } plugins { - id "org.sonarqube" version "2.8" + id 'org.sonarqube' version '2.8' } description = 'Spring Integration Samples' @@ -22,7 +22,7 @@ apply plugin: 'idea' ext { linkHomepage = 'https://projects.spring.io/spring-integration' linkCi = 'https://build.spring.io/browse/INTSAMPLES' - linkIssue = 'https://jira.spring.io/browse/INTSAMPLES' + linkIssue = 'https://github.com/spring-projects/spring-integration-samples/issues' linkScmUrl = 'https://github.com/spring-projects/spring-integration-samples' linkScmConnection = 'scm:git:git://github.com/spring-projects/spring-integration-samples.git' linkScmDevConnection = 'scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git' @@ -35,7 +35,7 @@ allprojects { mavenCentral() maven { url 'https://repo.spring.io/libs-milestone' } maven { url 'https://repo.spring.io/libs-snapshot' } - maven { url 'https://repo.spring.io/libs-staging-local' } +// maven { url 'https://repo.spring.io/libs-staging-local' } } } @@ -78,19 +78,19 @@ subprojects { subproject -> id = 'artembilan' name = 'Artem Bilan' email = 'abilan@vmware.com' - roles = ["project lead"] + roles = ['project lead'] } developer { id = 'garyrussell' name = 'Gary Russell' email = 'grussell@vmware.com' - roles = ["lead emeritus"] + roles = ['lead emeritus'] } developer { id = 'markfisher' name = 'Mark Fisher' email = 'markfisher@vmware.com' - roles = ["project founder and lead emeritus"] + roles = ['project founder and lead emeritus'] } } @@ -159,7 +159,7 @@ subprojects { subproject -> apply plugin: 'io.spring.dependency-management' jacoco { - toolVersion = "0.8.5" + toolVersion = "0.8.6" } compileJava { @@ -168,55 +168,55 @@ subprojects { subproject -> } ext { - activeMqVersion = '5.16.0' + activeMqVersion = '5.16.1' apacheSshdVersion = '2.5.1' aspectjVersion = '1.9.6' commonsDigesterVersion = '2.0' - commonsDbcpVersion = '2.7.0' + commonsDbcpVersion = '2.8.0' commonsFileUploadVersion = '1.4' - commonsIoVersion = '2.7' + commonsIoVersion = '2.8.0' commonsLangVersion = '2.6' commonsPoolVersion = '1.5.4' c3p0Version = '0.9.1.2' derbyVersion = '10.14.2.0' hamcrestVersion = '2.2' - hibernateVersion = '5.4.25.Final' + hibernateVersion = '5.4.28.Final' hibernateValidatorVersion = '6.1.2.Final' ftpServerVersion = '1.1.1' flexjsonVersion = '2.0' groovyVersion = '3.0.7' hsqldbVersion = '2.5.1' h2Version = '1.4.200' - jacksonVersion = '2.11.1' + jacksonVersion = '2.12.1' javaxInjectVersion = '1' - javaxMailVersion = '1.6.2' + javaxMailVersion = '1.6.5' jaxbVersion = '2.3.3' jodaTimeVersion = '1.6' jtaVersion = '1.1' jtdsVersion = '1.2.6' jmsApiVersion = '2.0.1' - jrubyVersion = '9.2.13.0' + jrubyVersion = '9.2.14.0' jpa21ApiVersion = '1.0.0.Final' jpaApiVersion = '2.2.1' jstlVersion = '1.2' - junitVersion = '4.13.1' + junitVersion = '4.13.2' jythonVersion = '2.7.2' - log4jVersion = '2.13.3' - mockitoVersion = '3.4.6' - mongoDriverVersion = '4.1.1' + log4jVersion = '2.14.0' + mockitoVersion = '3.7.7' + mongoDriverVersion = '4.2.0' openJpaVersion = '2.4.0' - oracleDriverVersion = '11.2.0.3' + oracleDriverVersion = '19.3.0.0' postgresVersion = '42.2.14' subethasmtpVersion = '1.2' - slf4jVersion = '1.7.25' + slf4jVersion = '1.7.30' springCloudVersion ='2020.0.0-SNAPSHOT' - springIntegrationVersion = '5.5.0-SNAPSHOT' + springIntegrationVersion = '5.5.0-M2' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springVersion = '5.3.3' - springSecurityVersion = '5.4.2' + springVersion = '5.3.4' + springSecurityVersion = '5.4.4' springWebFlowVersion = '2.3.3.RELEASE' - testcontainersVersion = '1.13.0' + testcontainersVersion = '1.15.2' tilesJspVersion = '2.2.1' validationApiVersion = '1.0.0.GA' } @@ -242,7 +242,7 @@ subprojects { subproject -> testCompile("org.mockito:mockito-core:$mockitoVersion") { exclude group: 'org.hamcrest' } - testCompile "org.springframework.integration:spring-integration-test" + testCompile 'org.springframework.integration:spring-integration-test' } configurations { @@ -255,9 +255,10 @@ subprojects { subproject -> jacocoTestReport { reports { - xml.enabled false + xml.enabled true csv.enabled false - html.destination file("${buildDir}/reports/jacoco/html") + html.enabled false + xml.destination file("${buildDir}/reports/jacoco/test/jacocoTestReport.xml") } } @@ -267,9 +268,10 @@ subprojects { subproject -> jacoco { destinationFile = file("$buildDir/jacoco.exec") } + if (System.properties['sonar.host.url']) { + finalizedBy jacocoTestReport + } } - - build.dependsOn jacocoTestReport } task cleanTarget(type: Delete) { @@ -284,8 +286,8 @@ project('advanced-testing-examples') { dependencies { compile "javax.jms:javax.jms-api:$jmsApiVersion" - compile "org.springframework.integration:spring-integration-jms" - compile "org.springframework.integration:spring-integration-groovy" + compile 'org.springframework.integration:spring-integration-jms' + compile 'org.springframework.integration:spring-integration-groovy' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -294,7 +296,7 @@ project('dynamic-ftp') { description = 'Dynamic FTP Demo' dependencies { - compile "org.springframework.integration:spring-integration-ftp" + compile 'org.springframework.integration:spring-integration-ftp' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -307,7 +309,7 @@ project('cafe-si') { mainClassName = 'org.springframework.integration.samples.cafe.xml.CafeDemoApp' dependencies { - compile "org.springframework.integration:spring-integration-stream" + compile 'org.springframework.integration:spring-integration-stream' compile 'com.fasterxml.jackson.core:jackson-databind' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } @@ -317,8 +319,8 @@ project('cafe-amqp') { description = 'Cafe - With AMQP Message Broker' dependencies { - compile project(":cafe-si") - compile "org.springframework.integration:spring-integration-amqp" + compile project(':cafe-si') + compile 'org.springframework.integration:spring-integration-amqp' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -327,12 +329,12 @@ project('cafe-jms') { description = 'Cafe - With JMS Message Broker' dependencies { - compile project(":cafe-si") + compile project(':cafe-si') compile "org.apache.activemq:activemq-broker:$activeMqVersion" compile("org.apache.activemq:activemq-kahadb-store:$activeMqVersion") { exclude group: "org.springframework" } - compile "org.springframework.integration:spring-integration-jms" + compile 'org.springframework.integration:spring-integration-jms' compile "javax.jms:javax.jms-api:$jmsApiVersion" compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } @@ -342,10 +344,10 @@ project('cafe-scripted') { description = 'Cafe Sample (Scripted Implementation)' dependencies { - compile "org.springframework.integration:spring-integration-stream" - compile "org.springframework.integration:spring-integration-groovy" - compile "org.springframework.integration:spring-integration-rmi" - compile "org.springframework.integration:spring-integration-jmx" + compile 'org.springframework.integration:spring-integration-stream' + compile 'org.springframework.integration:spring-integration-groovy' + compile 'org.springframework.integration:spring-integration-rmi' + compile 'org.springframework.integration:spring-integration-jmx' compile "org.jruby:jruby-complete:$jrubyVersion" compile "org.python:jython-standalone:$jythonVersion" compile "org.codehaus.groovy:groovy-all:$groovyVersion" @@ -372,7 +374,7 @@ project('loan-broker') { mainClassName = 'org.springframework.integration.samples.loanbroker.demo.LoanBrokerDemo' dependencies { - compile "org.springframework.integration:spring-integration-ip" + compile 'org.springframework.integration:spring-integration-ip' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } @@ -387,19 +389,19 @@ project('loanshark') { description = 'Loan Shark Sample' apply plugin: 'war' - apply plugin: "org.gretty" + apply plugin: 'org.gretty' apply plugin: 'eclipse-wtp' dependencies { - compile "org.springframework.integration:spring-integration-ip" - compile "org.springframework:spring-webmvc" - compile "org.springframework:spring-orm" - compile "org.springframework:spring-aop" - compile "org.springframework:spring-aspects" + compile 'org.springframework.integration:spring-integration-ip' + compile 'org.springframework:spring-webmvc' + compile 'org.springframework:spring-orm' + compile 'org.springframework:spring-aop' + compile 'org.springframework:spring-aspects' compile "org.aspectj:aspectjtools:$aspectjVersion" - compile "org.springframework:spring-jdbc" - compile "org.springframework:spring-tx" - compile "org.springframework:spring-context" + compile 'org.springframework:spring-jdbc' + compile 'org.springframework:spring-tx' + compile 'org.springframework:spring-context' compile "commons-fileupload:commons-fileupload:$commonsFileUploadVersion" compile "org.apache.commons:commons-dbcp2:$commonsDbcpVersion" compile "commons-digester:commons-digester:$commonsDigesterVersion" @@ -427,8 +429,8 @@ project('amqp') { description = 'AMQP Basic Sample' dependencies { - compile "org.springframework.integration:spring-integration-stream" - compile "org.springframework.integration:spring-integration-amqp" + compile 'org.springframework.integration:spring-integration-stream' + compile 'org.springframework.integration:spring-integration-amqp' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" runtime "org.slf4j:slf4j-jcl:$slf4jVersion" } @@ -462,8 +464,8 @@ project('barrier') { compile 'org.springframework.boot:spring-boot-starter-web' compile 'org.springframework.boot:spring-boot-starter-integration' compile 'org.springframework.boot:spring-boot-starter-amqp' - compile "org.springframework.integration:spring-integration-amqp" - compile "org.springframework.integration:spring-integration-http" + compile 'org.springframework.integration:spring-integration-amqp' + compile 'org.springframework.integration:spring-integration-http' testCompile 'org.springframework.boot:spring-boot-starter-test' } @@ -482,7 +484,7 @@ project('control-bus') { description = 'Control Bus Basic Sample' dependencies { - compile "org.springframework.integration:spring-integration-core" + compile 'org.springframework.integration:spring-integration-core' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -495,7 +497,7 @@ project('enricher') { mainClassName = 'org.springframework.integration.samples.enricher.Main' dependencies { - compile "org.springframework.integration:spring-integration-core" + compile 'org.springframework.integration:spring-integration-core' compile "com.h2database:h2:$h2Version" compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } @@ -505,7 +507,7 @@ project('feed') { description = 'Feed (RSS/ATOM) Basic Sample' dependencies { - compile "org.springframework.integration:spring-integration-feed" + compile 'org.springframework.integration:spring-integration-feed' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -514,7 +516,7 @@ project('file') { description = 'File Copy Basic Sample' dependencies { - compile "org.springframework.integration:spring-integration-file" + compile 'org.springframework.integration:spring-integration-file' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -523,7 +525,7 @@ project('ftp') { description = 'FTP Basic Sample' dependencies { - compile "org.springframework.integration:spring-integration-ftp" + compile 'org.springframework.integration:spring-integration-ftp' compile "commons-io:commons-io:$commonsIoVersion" compile "org.apache.ftpserver:ftpserver-core:$ftpServerVersion" compile "org.slf4j:slf4j-api:$slf4jVersion" @@ -531,7 +533,7 @@ project('ftp') { runtime "org.slf4j:slf4j-log4j12:$slf4jVersion" testCompile "org.apache.logging.log4j:log4j-core:$log4jVersion" - testCompile "org.springframework.integration:spring-integration-test" + testCompile 'org.springframework.integration:spring-integration-test' } test { @@ -543,7 +545,7 @@ project('helloworld') { description = 'Hello World Sample' dependencies { - compile "org.springframework.integration:spring-integration-core" + compile 'org.springframework.integration:spring-integration-core' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } @@ -564,32 +566,33 @@ project('http') { apply plugin: 'war' apply plugin: 'application' - apply plugin: "org.gretty" + apply plugin: 'org.gretty' apply plugin: 'eclipse-wtp' mainClassName = 'org.springframework.integration.samples.http.HttpClientDemo' dependencies { - compile "org.springframework.integration:spring-integration-http" - compile "org.springframework.integration:spring-integration-mail" - compile "org.springframework:spring-webmvc" + compile 'org.springframework.integration:spring-integration-http' + compile 'org.springframework.integration:spring-integration-mail' + compile 'org.springframework:spring-webmvc' compile "commons-fileupload:commons-fileupload:$commonsFileUploadVersion" compile "commons-io:commons-io:$commonsIoVersion" - compile "javax.mail:javax.mail-api:$javaxMailVersion" - compile "com.sun.mail:javax.mail:$javaxMailVersion" + compile "jakarta.mail:jakarta.mail-api:$javaxMailVersion" + compile "com.sun.mail:imap:$javaxMailVersion" + compile "com.sun.mail:jakarta.mail:$javaxMailVersion" compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } } -project('splunk') { +/*project('splunk') { description = 'Splunk Sample' apply plugin: 'org.springframework.boot' dependencies { compile 'org.springframework.boot:spring-boot-starter-integration' - compile "org.springframework.integration:spring-integration-core" + compile 'org.springframework.integration:spring-integration-core' compile "org.springframework.integration:spring-integration-splunk:$springIntegrationSplunkVersion" testCompile 'org.springframework.boot:spring-boot-starter-test' } @@ -602,7 +605,7 @@ project('splunk') { main 'org.springframework.integration.samples.splunk.Application' classpath = sourceSets.main.runtimeClasspath } -} +}*/ project('kafka') { description = 'Apache Kafka Sample' @@ -614,7 +617,7 @@ project('kafka') { compile ('org.springframework.integration:spring-integration-kafka') { exclude group: 'org.slf4j' } - compile "org.springframework.integration:spring-integration-core" + compile 'org.springframework.integration:spring-integration-core' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" @@ -638,8 +641,8 @@ project('mqtt') { dependencies { compile 'org.springframework.boot:spring-boot-starter-integration' - compile "org.springframework.integration:spring-integration-stream" - compile "org.springframework.integration:spring-integration-mqtt" + compile 'org.springframework.integration:spring-integration-stream' + compile 'org.springframework.integration:spring-integration-mqtt' testCompile 'org.springframework.boot:spring-boot-starter-test' testCompile "org.springframework.integration:spring-integration-test" } @@ -667,13 +670,14 @@ project('si4demo') { dependencies { compile 'org.springframework.boot:spring-boot-starter-web' compile 'org.springframework.boot:spring-boot-starter-integration' - compile "org.springframework.integration:spring-integration-mail" + compile 'org.springframework.integration:spring-integration-mail' compile "org.springframework.integration:spring-integration-social-twitter:$springIntegrationSocialTwiterVersion" - compile "org.springframework.integration:spring-integration-http" - compile "org.springframework.integration:spring-integration-ip" - compile "javax.mail:javax.mail-api:$javaxMailVersion" - compile "com.sun.mail:javax.mail:$javaxMailVersion" - compile "com.rometools:rome:1.5.0" + compile 'org.springframework.integration:spring-integration-http' + compile 'org.springframework.integration:spring-integration-ip' + compile "jakarta.mail:jakarta.mail-api:$javaxMailVersion" + compile "com.sun.mail:imap:$javaxMailVersion" + compile "com.sun.mail:jakarta.mail:$javaxMailVersion" + compile 'com.rometools:rome:1.5.0' testCompile 'org.springframework.boot:spring-boot-starter-test' } @@ -695,7 +699,7 @@ project('cafe-dsl') { dependencies { compile project(":cafe-si") compile 'org.springframework.boot:spring-boot-starter-integration' - compile "org.springframework.integration:spring-integration-core" + compile 'org.springframework.integration:spring-integration-core' testCompile 'org.springframework.boot:spring-boot-starter-test' } @@ -718,7 +722,7 @@ project('jdbc') { mainClassName = 'org.springframework.integration.samples.jdbc.Main' dependencies { - compile "org.springframework.integration:spring-integration-jdbc" + compile 'org.springframework.integration:spring-integration-jdbc' compile "com.h2database:h2:$h2Version" compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } @@ -733,15 +737,15 @@ project('jms') { dependencies { compile "javax.jms:javax.jms-api:$jmsApiVersion" - compile "org.springframework.integration:spring-integration-jms" - compile "org.springframework.integration:spring-integration-stream" + compile 'org.springframework.integration:spring-integration-jms' + compile 'org.springframework.integration:spring-integration-stream' compile "org.apache.activemq:activemq-broker:$activeMqVersion" compile("org.apache.activemq:activemq-kahadb-store:$activeMqVersion") { exclude group: "org.springframework" } compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - testCompile "org.springframework.integration:spring-integration-test" + testCompile 'org.springframework.integration:spring-integration-test' } } @@ -749,8 +753,8 @@ project('jmx') { description = 'JMX Basic Sample' dependencies { - compile "org.springframework.integration:spring-integration-jmx" - compile "org.springframework.integration:spring-integration-stream" + compile 'org.springframework.integration:spring-integration-jmx' + compile 'org.springframework.integration:spring-integration-stream' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -765,10 +769,10 @@ project('jpa') { dependencies { compile 'org.springframework.boot:spring-boot-starter-data-jpa' - compile "org.springframework.integration:spring-integration-jpa" + compile 'org.springframework.integration:spring-integration-jpa' compile "com.h2database:h2:$h2Version" - runtime "org.springframework:spring-instrument" + runtime 'org.springframework:spring-instrument' runtime "org.hibernate.javax.persistence:hibernate-jpa-2.1-api:$jpa21ApiVersion" testCompile 'org.springframework.boot:spring-boot-starter-test' @@ -784,10 +788,11 @@ project('mail') { description = 'Mail (IMAP + POP3) Sample' dependencies { - compile "org.springframework.integration:spring-integration-mail" - compile "org.springframework:spring-context" - compile "javax.mail:javax.mail-api:$javaxMailVersion" - compile "com.sun.mail:javax.mail:$javaxMailVersion" + compile 'org.springframework.integration:spring-integration-mail' + compile 'org.springframework:spring-context' + compile "jakarta.mail:jakarta.mail-api:$javaxMailVersion" + compile "com.sun.mail:imap:$javaxMailVersion" + compile "com.sun.mail:jakarta.mail:$javaxMailVersion" compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } @@ -806,7 +811,7 @@ project('mongodb') { description = 'MongoDb Basic Sample' dependencies { - compile "org.springframework.integration:spring-integration-mongodb" + compile 'org.springframework.integration:spring-integration-mongodb' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" compile "org.mongodb:mongodb-driver-sync:$mongoDriverVersion" } @@ -826,7 +831,7 @@ project('oddeven') { description = 'Odd-Even Sample' dependencies { - compile "org.springframework.integration:spring-integration-core" + compile 'org.springframework.integration:spring-integration-core' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } @@ -845,7 +850,7 @@ project('quote') { description = 'Quote Sample' dependencies { - compile "org.springframework.integration:spring-integration-stream" + compile 'org.springframework.integration:spring-integration-stream' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -854,7 +859,7 @@ project('sftp') { description = 'SFTP Basic Sample' dependencies { - compile "org.springframework.integration:spring-integration-sftp" + compile 'org.springframework.integration:spring-integration-sftp' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" testCompile "org.apache.sshd:sshd-sftp:$apacheSshdVersion" } @@ -868,8 +873,8 @@ project('tcp-amqp') { mainClassName = 'org.springframework.integration.samples.tcpamqp.Main' dependencies { - compile "org.springframework.integration:spring-integration-amqp" - compile "org.springframework.integration:spring-integration-ip" + compile 'org.springframework.integration:spring-integration-amqp' + compile 'org.springframework.integration:spring-integration-ip' compile "org.slf4j:slf4j-api:$slf4jVersion" runtime "org.apache.logging.log4j:log4j-core:$log4jVersion" @@ -885,7 +890,7 @@ project('tcp-broadcast') { dependencies { compile 'org.springframework.boot:spring-boot-starter-web' compile 'org.springframework.boot:spring-boot-starter-integration' - compile "org.springframework.integration:spring-integration-ip" + compile 'org.springframework.integration:spring-integration-ip' testCompile 'org.springframework.boot:spring-boot-starter-test' } @@ -908,9 +913,9 @@ project('tcp-client-server') { mainClassName = 'org.springframework.integration.samples.tcpclientserver.Main' dependencies { - compile "org.springframework.integration:spring-integration-ip" + compile 'org.springframework.integration:spring-integration-ip' compile "commons-lang:commons-lang:$commonsLangVersion" - compile "org.springframework.integration:spring-integration-test" + compile 'org.springframework.integration:spring-integration-test' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -925,9 +930,9 @@ project('testcontainers-rabbitmq') { } dependencies { - compile "org.springframework.boot:spring-boot-starter-integration" - compile "org.springframework.integration:spring-integration-amqp" - compile "org.springframework.boot:spring-boot-starter-json" + compile 'org.springframework.boot:spring-boot-starter-integration' + compile 'org.springframework.integration:spring-integration-amqp' + compile 'org.springframework.boot:spring-boot-starter-json' testCompile('org.springframework.boot:spring-boot-starter-test') { exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' @@ -937,7 +942,7 @@ project('testcontainers-rabbitmq') { testCompile 'org.springframework.cloud:spring-cloud-starter' testCompile "org.testcontainers:junit-jupiter:$testcontainersVersion" - testCompile "com.playtika.testcontainers:embedded-rabbitmq:1.42" + testCompile 'com.playtika.testcontainers:embedded-rabbitmq:1.42' } @@ -961,13 +966,13 @@ project('testing-examples') { mainClassName = 'org.springframework.integration.samples.testing.externalgateway.Main' dependencies { - compile "org.springframework.integration:spring-integration-file" - compile "org.springframework.integration:spring-integration-http" - compile "org.springframework.integration:spring-integration-ws" - compile "org.springframework:spring-webmvc" + compile 'org.springframework.integration:spring-integration-file' + compile 'org.springframework.integration:spring-integration-http' + compile 'org.springframework.integration:spring-integration-ws' + compile 'org.springframework:spring-webmvc' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - testCompile "org.springframework.integration:spring-integration-test" + testCompile 'org.springframework.integration:spring-integration-test' } } @@ -988,13 +993,13 @@ project('ws-inbound-gateway') { description = 'WS Inbound Gateway Sample' apply plugin: 'war' - apply plugin: "org.gretty" + apply plugin: 'org.gretty' apply plugin: 'eclipse-wtp' dependencies { - compile "org.springframework.integration:spring-integration-xml" - compile "org.springframework.integration:spring-integration-ws" - compile "org.springframework:spring-webmvc" + compile 'org.springframework.integration:spring-integration-xml' + compile 'org.springframework.integration:spring-integration-ws' + compile 'org.springframework:spring-webmvc' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } @@ -1011,9 +1016,8 @@ project('ws-outbound-gateway') { mainClassName = 'org.springframework.integration.samples.ws.WebServiceDemoTestApp' dependencies { - compile "org.springframework.integration:spring-integration-stream" - compile "org.springframework.integration:spring-integration-ws" -// compile 'com.sun.xml.messaging.saaj:saaj-impl:1.3.19' + compile 'org.springframework.integration:spring-integration-stream' + compile 'org.springframework.integration:spring-integration-ws' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -1026,7 +1030,7 @@ project('xml') { mainClassName = 'org.springframework.integration.samples.xml.BookOrderProcessingTestApp' dependencies { - compile "org.springframework.integration:spring-integration-xml" + compile 'org.springframework.integration:spring-integration-xml' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -1035,7 +1039,7 @@ project('xmpp') { description = 'XMPP Basic Sample' dependencies { - compile "org.springframework.integration:spring-integration-xmpp" + compile 'org.springframework.integration:spring-integration-xmpp' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } @@ -1048,7 +1052,7 @@ project('async-gateway') { description = 'Async Gateway Sample' dependencies { - compile "org.springframework.integration:spring-integration-core" + compile 'org.springframework.integration:spring-integration-core' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -1061,7 +1065,7 @@ project('dynamic-poller') { mainClassName = 'org.springframework.integration.samples.poller.Main' dependencies { - compile "org.springframework.integration:spring-integration-core" + compile 'org.springframework.integration:spring-integration-core' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -1070,7 +1074,7 @@ project('errorhandling') { description = 'Error Handling Sample' dependencies { - compile "org.springframework.integration:spring-integration-stream" + compile 'org.springframework.integration:spring-integration-stream' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -1079,7 +1083,7 @@ project('file-processing') { description = 'File Processing Sample' dependencies { - compile "org.springframework.integration:spring-integration-file" + compile 'org.springframework.integration:spring-integration-file' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -1092,14 +1096,15 @@ project('mail-attachments') { mainClassName = 'org.springframework.integration.samples.mailattachments.Main' dependencies { - compile "org.springframework.integration:spring-integration-mail" - compile "org.springframework.integration:spring-integration-file" - compile "javax.mail:javax.mail-api:$javaxMailVersion" - compile "com.sun.mail:javax.mail:$javaxMailVersion" + compile 'org.springframework.integration:spring-integration-mail' + compile 'org.springframework.integration:spring-integration-file' + compile "jakarta.mail:jakarta.mail-api:$javaxMailVersion" + compile "com.sun.mail:imap:$javaxMailVersion" + compile "com.sun.mail:jakarta.mail:$javaxMailVersion" compile "commons-io:commons-io:$commonsIoVersion" compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - testCompile "org.springframework.integration:spring-integration-test" + testCompile 'org.springframework.integration:spring-integration-test' testCompile "org.subethamail:subethasmtp-wiser:$subethasmtpVersion" } @@ -1109,17 +1114,17 @@ project('monitoring') { description = 'Monitoring Application' apply plugin: 'war' - apply plugin: "org.gretty" + apply plugin: 'org.gretty' apply plugin: 'application' apply plugin: 'eclipse-wtp' mainClassName = 'org.springintegration.SpringIntegrationTest' dependencies { - compile "org.springframework.integration:spring-integration-jmx" + compile 'org.springframework.integration:spring-integration-jmx' compile "org.springframework.integration:spring-integration-social-twitter:$springIntegrationSocialTwiterVersion" - compile "org.springframework.integration:spring-integration-groovy" - compile "org.springframework:spring-webmvc" + compile 'org.springframework.integration:spring-integration-groovy' + compile 'org.springframework:spring-webmvc' compile "javax.servlet:jstl:$jstlVersion" compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } @@ -1129,12 +1134,12 @@ project('multipart-http') { description = 'HTTP Multipart Demo' apply plugin: 'war' - apply plugin: "org.gretty" + apply plugin: 'org.gretty' apply plugin: 'eclipse-wtp' dependencies { - compile "org.springframework.integration:spring-integration-http" - compile "org.springframework:spring-webmvc" + compile 'org.springframework.integration:spring-integration-http' + compile 'org.springframework:spring-webmvc' compile 'com.fasterxml.jackson.core:jackson-databind' compile "commons-fileupload:commons-fileupload:$commonsFileUploadVersion" compile "commons-io:commons-io:$commonsIoVersion" @@ -1146,17 +1151,17 @@ project('rest-http') { description = 'Spring Integration Rest HTTP Path Usage Demo' apply plugin: 'war' - apply plugin: "org.gretty" + apply plugin: 'org.gretty' apply plugin: 'eclipse-wtp' dependencies { - compile "org.springframework.integration:spring-integration-http" - compile "org.springframework:spring-webmvc" - compile "org.springframework:spring-oxm" - compile "org.springframework:spring-tx" - compile "org.springframework:spring-jdbc" - compile "org.springframework:spring-context" - compile "org.springframework:spring-aop" + compile 'org.springframework.integration:spring-integration-http' + compile 'org.springframework:spring-webmvc' + compile 'org.springframework:spring-oxm' + compile 'org.springframework:spring-tx' + compile 'org.springframework:spring-jdbc' + compile 'org.springframework:spring-context' + compile 'org.springframework:spring-aop' compile 'com.fasterxml.jackson.core:jackson-databind' compile "org.springframework.security:spring-security-web:$springSecurityVersion" compile "org.springframework.security:spring-security-config:$springSecurityVersion" @@ -1174,10 +1179,10 @@ project('retry-and-more') { description = 'Retry and More Sample' dependencies { - compile "org.springframework.integration:spring-integration-stream" - compile "org.springframework.integration:spring-integration-amqp" - compile "org.springframework.integration:spring-integration-ftp" - compile "org.springframework.integration:spring-integration-file" + compile 'org.springframework.integration:spring-integration-stream' + compile 'org.springframework.integration:spring-integration-amqp' + compile 'org.springframework.integration:spring-integration-ftp' + compile 'org.springframework.integration:spring-integration-file' compile("org.mockito:mockito-core:$mockitoVersion") { exclude group: 'org.hamcrest' } @@ -1219,7 +1224,7 @@ project('splitter-aggregator-reaper') { mainClassName = 'org.springframework.integration.samples.splitteraggregator.Main' dependencies { - compile "org.springframework.integration:spring-integration-core" + compile 'org.springframework.integration:spring-integration-core' compile "javax.inject:javax.inject:$javaxInjectVersion" compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } @@ -1234,7 +1239,7 @@ project('stored-procedures-derby') { mainClassName = 'org.springframework.integration.samples.storedprocedure.Main' dependencies { - compile "org.springframework.integration:spring-integration-jdbc" + compile 'org.springframework.integration:spring-integration-jdbc' compile "org.apache.derby:derby:$derbyVersion" compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } @@ -1252,9 +1257,8 @@ project('stored-procedures-oracle') { } dependencies { - compile "org.springframework.integration:spring-integration-jdbc" -//TODO Uncomment it when the ojdbc6 artifact is available in the mavenLocal() -// compile "com.oracle:ojdbc6:$oracleDriverVersion" + compile 'org.springframework.integration:spring-integration-jdbc' + compile "com.oracle.ojdbc:ojdbc8:$oracleDriverVersion" compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } @@ -1271,7 +1275,7 @@ project('stored-procedures-ms') { mainClassName = 'org.springframework.integration.samples.storedprocedure.Main' dependencies { - compile "org.springframework.integration:spring-integration-jdbc" + compile 'org.springframework.integration:spring-integration-jdbc' compile "net.sourceforge.jtds:jtds:$jtdsVersion" compile "c3p0:c3p0:$c3p0Version" compile "org.apache.logging.log4j:log4j-core:$log4jVersion" @@ -1290,7 +1294,7 @@ project('stored-procedures-postgresql') { mainClassName = 'org.springframework.integration.samples.storedprocedure.Main' dependencies { - compile "org.springframework.integration:spring-integration-jdbc" + compile 'org.springframework.integration:spring-integration-jdbc' compile "org.postgresql:postgresql:$postgresVersion" compile "org.apache.commons:commons-dbcp2:$commonsDbcpVersion" compile "commons-pool:commons-pool:$commonsPoolVersion" @@ -1330,10 +1334,10 @@ project('tcp-client-server-multiplex') { description = 'TCP Client Server Multiplexing Sample' dependencies { - compile "org.springframework.integration:spring-integration-ip" + compile 'org.springframework.integration:spring-integration-ip' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - testCompile "org.springframework.integration:spring-integration-test" + testCompile 'org.springframework.integration:spring-integration-test' } } @@ -1345,9 +1349,9 @@ project('travel') { mainClassName = 'org.springframework.integration.samples.travel.Main' dependencies { - compile "org.springframework.integration:spring-integration-ws" - compile "org.springframework.integration:spring-integration-http" - compile "org.springframework:spring-web" + compile 'org.springframework.integration:spring-integration-ws' + compile 'org.springframework.integration:spring-integration-http' + compile 'org.springframework:spring-web' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -1360,8 +1364,8 @@ project('tx-synch') { mainClassName = 'org.springframework.integration.samples.advice.TransactionSynchronizationDemo' dependencies { - compile "org.springframework.integration:spring-integration-jdbc" - compile "org.springframework.integration:spring-integration-file" + compile 'org.springframework.integration:spring-integration-jdbc' + compile 'org.springframework.integration:spring-integration-file' compile "com.h2database:h2:$h2Version" compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } @@ -1395,9 +1399,9 @@ project('stomp-chat') { dependencies { compile 'org.springframework.boot:spring-boot-starter-websocket' - compile "org.springframework.integration:spring-integration-websocket" - compile "org.springframework.integration:spring-integration-event" - compile "org.springframework.integration:spring-integration-groovy" + compile 'org.springframework.integration:spring-integration-websocket' + compile 'org.springframework.integration:spring-integration-event' + compile 'org.springframework.integration:spring-integration-groovy' testCompile 'org.springframework.boot:spring-boot-starter-test' } @@ -1418,8 +1422,8 @@ project('kafka-dsl') { dependencies { compile 'org.springframework.boot:spring-boot-starter-integration' - compile "org.springframework.integration:spring-integration-core" - compile ('org.springframework.integration:spring-integration-kafka') + compile 'org.springframework.integration:spring-integration-core' + compile 'org.springframework.integration:spring-integration-kafka' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" testCompile 'org.springframework.boot:spring-boot-starter-test' } @@ -1446,14 +1450,15 @@ project('file-split-ftp') { dependencies { compile 'org.springframework.boot:spring-boot-starter-web' compile 'org.springframework.boot:spring-boot-starter-integration' - compile "org.springframework.integration:spring-integration-ftp" - compile "org.springframework.integration:spring-integration-http" - compile "org.springframework.integration:spring-integration-mail" - compile "javax.mail:javax.mail-api:$javaxMailVersion" - compile "com.sun.mail:javax.mail:$javaxMailVersion" + compile 'org.springframework.integration:spring-integration-ftp' + compile 'org.springframework.integration:spring-integration-http' + compile 'org.springframework.integration:spring-integration-mail' + compile "jakarta.mail:jakarta.mail-api:$javaxMailVersion" + compile "com.sun.mail:imap:$javaxMailVersion" + compile "com.sun.mail:jakarta.mail:$javaxMailVersion" testCompile 'org.springframework.boot:spring-boot-starter-test' - testCompile "org.springframework.integration:spring-integration-test" + testCompile 'org.springframework.integration:spring-integration-test' } springBoot { @@ -1473,7 +1478,7 @@ project('dynamic-tcp-client') { dependencies { compile 'org.springframework.boot:spring-boot-starter-integration' - compile "org.springframework.integration:spring-integration-ip" + compile 'org.springframework.integration:spring-integration-ip' testCompile 'org.springframework.boot:spring-boot-starter-test' } @@ -1495,7 +1500,7 @@ project('tcp-with-headers') { dependencies { compile 'org.springframework.boot:spring-boot-starter-integration' - compile "org.springframework.integration:spring-integration-ip" + compile 'org.springframework.integration:spring-integration-ip' compile 'com.fasterxml.jackson.core:jackson-databind' testCompile 'org.springframework.boot:spring-boot-starter-test' @@ -1517,12 +1522,11 @@ project('tcp-with-headers') { sonarqube { properties { - property "sonar.jacoco.reportPath", "${buildDir.name}/jacoco.exec" - property "sonar.links.homepage", linkHomepage - property "sonar.links.ci", linkCi - property "sonar.links.issue", linkIssue - property "sonar.links.scm", linkScmUrl - property "sonar.links.scm_dev", linkScmDevConnection - property "sonar.java.coveragePlugin", "jacoco" + property 'sonar.links.homepage', linkHomepage + property 'sonar.links.ci', linkCi + property 'sonar.links.issue', linkIssue + property 'sonar.links.scm', linkScmUrl + property 'sonar.links.scm_dev', linkScmDevConnection } } + diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 1a68df90..6eeca988 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.springframework.integration.samples cafe-dsl @@ -92,7 +92,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -120,7 +120,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -181,28 +181,28 @@ org.springframework.boot spring-boot-dependencies - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT import pom com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index d80ed55c..9c85d9e8 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.springframework.integration.samples kafka-dsl @@ -91,7 +91,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -103,7 +103,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -131,7 +131,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -192,28 +192,28 @@ org.springframework.boot spring-boot-dependencies - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT import pom com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/dsl/pom.xml b/dsl/pom.xml index 7c4066e9..82908b88 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -51,7 +51,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -79,7 +79,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -121,21 +121,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 09156416..442a5d66 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.springframework.integration.samples si4demo @@ -123,9 +123,9 @@ - javax.mail - javax.mail-api - 1.6.2 + jakarta.mail + jakarta.mail-api + 1.6.5 compile @@ -136,8 +136,20 @@ com.sun.mail - javax.mail - 1.6.2 + imap + 1.6.5 + compile + + + jackson-module-kotlin + com.fasterxml.jackson.module + + + + + com.sun.mail + jakarta.mail + 1.6.5 compile @@ -161,7 +173,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -189,7 +201,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -250,28 +262,28 @@ org.springframework.boot spring-boot-dependencies - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT import pom com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/gradle.properties b/gradle.properties index 3d4de897..0bde4ae0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ version=5.4.0 -springBootVersion=2.4.0-SNAPSHOT +springBootVersion=2.5.0-SNAPSHOT org.gradle.jvmargs=-Xmx1536m diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 62d4c053550b91381bbd28b1afc82d634bf73a8a..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f 100644 GIT binary patch delta 6656 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 Yte!%o?r4GTrVtxD61Ym!|5fq-1K$0e!T1w z1SC8j)_dObefzK9b=~*c&wBRW>;B{VGKiBofK!FMN5oJBE0V;;!kWUz!jc1W?5KdY zyZ3mCBHprpchz-9{ASiJJh&&h1|4rdw6wxD2+9= z#6#}Uq8&^1F3wgvGFoNDo?bIeEQXpcuAR0-+w$JWoK-@yUal1M&~W_O)r+Rx;{@hWH5n^oQWR36GMYBDDZyPK4L@WVjRrF+XlSzi4X4!_!U%Uujl6LHQ#|l(sUU%{ zefYd8jnVYP91K}Qn-OmmSLYFK1h~_}RPS~>+Xdz%dpvpJ{ll!IKX=JN99qowqslbO zV3DmqPZ}6>KB!9>jEObpi$u5oGPfO3O5!o3N2Mn`ozpje<}1I1H)m2rJDcB7AwXc6 z6j)tnPiql7#)r+b+p9?MVahp&=qJ^$oG+a^C*);FoJ!+V*^W+|2Olx5{*&$bXth)U zejc7mU6cBp?^Rj|dd{GL-0eHRTBi6_yJ&GLP5kIncv^z{?=0AVy^5{S8_n=rtua!J zFGY=A(yV^ZhB}1J_y(F`3QTu+zkHlw;1GiFeP&pw0N1k%NShHlO(4W+(!wy5phcg4 zA-|}(lE_1@@e6y`veg;v7m;q%(PFG&K3#}eRhJioXUU0jg_8{kn$;KVwf;zpL2X_( zC*_R#5*PaBaY73(x*oZ}oE#HPLJQRQ7brNK=v!lsu==lSG1(&q>F)`adBT~d*lMS| z%!%7(p~<7kWNmpZ5-N31*e=8`kih|g5lVrI%2wnLF-2D+G4k6@FrYsJ_80AJ}KMRi>) z-kIeHp{maorNWkF81v0FKgB==_6blyaF$5GaW)B!i4v*jNk6r)vU6?G$0pV8(Y+UK z5lgRVt%;N_gWp)^osv=h+^07UY6+$4^#t=M3>0i0`{`aEkFLL#a)93uXhYO+aKTtu zckg2T9S&GKNtZmdAS^8PzvDva-%-K&g9eqPXQ4$dM^inr@6Zl z{!Cq&C_+V;g*{>!0cZP}?ogDb$#ZS=n@NHE{>k@84lOkl&$Bt2NF)W%GClViJq14_ zQIfa^q+0aq){}CO8j%g%R9|;G0uJuND*HO$2i&U_uW_a5xJ33~(Vy?;%6_(2_Cuq1 zLhThN@xH7-BaNtkKTn^taQHrs$<<)euc6z(dhps>SM;^Wx=7;O&IfNVJq3wk4<1VS z-`*7W4DR_i^W4=dRh>AXi~J$K>`UqP>CKVVH&+T(ODhRJZO7DScU$F7D)di-%^8?O z6)Ux`zdrVOe1GNkPo0FgrrxSu1AGQkJe@pqu}8LkBDm+V!N_1l}`tjLW8${rgDLv3m@E*#zappt-Mm zSC<$o+6UO~w0C=(0$&*y**@nKe_Q{|eAuD!(0YL0_a{z%+sdfSyP={Nyd$re6Rzbp zvsgTY7~VflX0^Vf7qqomYZ_$ryrFVV2$sFyzw2r%Q8*uYDA+)iQdfKms_5(>!s#!( z!P5S(N0i9CKQKaqg(U%Gk#V3*?)lO6dLv`8KB~F<-%VhbtL8Rl>mEz+PN=qx&t*|= zQHV=qG)YKlPk4iCyWIUGjC?kpeA>hIBK*A?B0)rB=RqAal#D%1C9yVQwBcz${#Jb5 zR{TRmMrOrJsLc&6x9qDo@FJ^=do_Y?3oU0G^nV5_EU&+DS+VA7Tp{^TAF>yZbyM3c zf*1CqHY9T|aL_lyY7c)i!_MtGPA!sdy3|mrsKVj1mi&>dms@-ozSa}OZ?2I*tAndg z@S7er$t^d^-;!wLQbG60nWd@1pQVD7tw-G_B#OscoYyremiZ_hj8*sXqQdchuD^!R zpXGuSj5psk+jR>3rWu3^`17>j&*^9^rWbszP=Mf@5KIEj%b=z98v=Ymp%$FYt>%Ld zm8})EDbNOJu9n)gwhz_RS``#Ag)fr)3<*?(!9O~mTQWeh;8c;0@o=iBLQNqx3d_2#W7S9#FXzr6VXfs>4 z;QXw}-STvK9_-7H=uqgal2{GkbjVLN+=D5ddd)4^WvX;(NYA*X*(JxTdiUzqVJopd zQg#~psX4o<)cF>r=rxP`(Xsf<+HG-pf&7aFPL8z|-&B*P?Vmsu5d>Nlg^2$WRY!S@#`g2{81;(1w#o5HsvN}5pFZi});>|VK^kL{Zkx~wgn ztlZp;HW`H8(GdRfIwc~?#N6}o#h158ohI*GIsK%56I_9sf2k_K@4vD!l{(dX9E7PJ;w>$|Y;-VBJSO4@){07bo-89^LZ9g<<%;dOl zyIq{s8`8Ltp*GDwu(l_Z$6sA2nam$BM$Q~6TpZg)w2TtW?G5whV(lRwaf$6EU86is zBP9Rs&vS_~sk?Nn_b}^HkM8LiO@>J}=g(T4hLmvH@5Jj#2aHa~K)lD9VB0k>$V2BP zgh;(=y9Op(KQ=H5vj+%qs>?s4tYN~-Q|fyQePA)s?HrF~;l!+@t8VMzqUpqMLudFT z)=o~s!MM4XkgbetIsODwtQ=FF$IcIp&!pjh6Q6{tL+l*7GQ%8Wsg(tC#qU3oW$~n) zL=>XIxI}Hi7HS0F_mmi+(c%1HDuKiWm>|6Xa}nW7ei55ggru9)xjBvC#JcEIN*#cp zv*ACvr=HTC?dX9NNo9Yhulu_gX5Z~}QQ2&QZ&C77{(>Y3_ z6j5Z1Uc5FtPEpS_31HsgmSLHZijGb_p$WlRJ1p^_1!ZLP8kr6OtCEK7Qh267o$H>e zf<4cNGQRk{g5h$XfvTFQ@`qm@iju83-~}ebAYpZryARHVR$AEt3229U{y@Fp4 z-8FBBtGG&(hTyUdx5ZOfiz`c=<0F%+w|Fl=rWk{K7>70k04SN?RU(^mrKSeKDqA!K^Hsv8C?#ioj4@WUL zC*?{hTai6q0%_oBTqDHygp_Kl;({sAScYQIwMDM1U>{x0ww zve?_}E;DG?+|zsUrsph5X_G7l#Y~vqkq3@NNDabbw7|`eJBmn`Qrlr%?`va=mm$Mc{+FBbQbogAZ6{MuzT|P%QZZotd21eb1hfj|;GYAX&>bx#D5EB+=XMj2XJkpnyMUykaVo) zj3ZLqEl1&)Rturc8m@+uUuD^vaNaSxGwP4dq0-OSb~62lPv8E_K4usLvG{Qg zdR%z8dd2H!{JaT|X_bfm{##*W$YM;_J8Y8&Z)*ImOAf4+| zEyi)qK%Ld1bHuqD+}-WiCnjszDeC-%8g+8JRpG1bOc!xUGB?@?6f~FTrI%U#5R~YF z%t5(S2Q>?0`(XNHa8xKdTEZ~Z4SJOheit#ldfdg63}#W6j8kO;SjQD`vftxS+#x1B zYu|5szEvkyz|}|B3x|DNlyi$;+n+cW$Hu+?)=X1!sa%{H-^;oBO9XACZJ}wkQ!sTa zQ#J3h|HX{{&WwIG3h7d6aWktuJaO)ie6&=KJBoX@w(rBWfin`*a6OmCC5M0HzL(gv zY<*e4hmW>SWVhxk-`UGOAbD%Hk+uu<^7zJ_ytVXamfqCd0$g+W08>?QAB}Cv{b}eM z@X}ILg+uT%>-6`A25p@uhS3%;u>ccSq}8|H_^o&`nBT5S0y z;2H0I^(4MO*S+(4l$gULc4KSeKvidto5Nl0P|%9CqQ*ikY!w_GUlo}sb9HYB=L^oFpJ zfTQskXW!LFVnUo4(OHPDaZSf3zB|3{RGu1>ueE$(+dr?tT zp!SGlqDU8vu{5xLWSvj+j$arHglg54#Lx&TvuO3LIIU>hF9Uoj&=-b*Q?uYr`#V?xz?2 zhirZrv^eA{k%{hFh%9LYVXEYWd5#PuUd1QqaqB*J!CMXEM>fEB$@#1>mtB`Bfil}t zhhTIObqh5HRvT+4q_Do$Q*Jika?qV=Np-DtPkU z(KoXyWLfPwr@UY1)hBAvR3nCBZgd|CevTG?H~HqDF}dzy%2sd2`f{^CBbTk*^K~RO zN~O0+2EjAJlywF%SjgYz810l&G5AqzI<=Ber{912^PpSPRJl3dm8W@dKHL}7_@k3)Y!SXYkyxQy>Q4I2o zr`ev7fLF$1t96h|sH<-#*YzGD-b^3$_!#wsh(Yw;)b@udLz9mm`mFYh z1Zz24KIQJ(*_-E0(3&1InqG;U?wF)GYd>DFo(em`#|UaaYmkA9;GTX7b?0@C@QkTVpGD#mf$dQoRNV=n{^Zi_W*ps;3?^$s`0;ER7;==~OmQ~9 zS5P=FjxE5%|;xq6h4@!_h?@|aK&FYI2IT(OHXv2%1 zWEo-v!L7x^YT(xLVHlpJttcwaF@1Y;-S*q3CRa!g7xdzl|Jan>2#dI0`LKl!T1GMk zRKe4|bQO&ET}Z^Aiym*HII>cSxIzl|F~JEUGxz;+DB=8fxXhnBI4R12q6ews$lA`Jfi}r@A@-)6TOAUMNYFYJ zZ-Zd?lxFTyjN3mXnL!%#>Z%$0gJ4*9g;e;@zSmQ{eGGDaRRNM3s@6!;hYuVc=c+3B z=qzNNS~n^EsJU4aOGE|mdy={C^lPKEfPL-IJAsTpQsDgZ@~s+eHZYmp9yb=YW_4r?lqQaYZQ`nau){W`LY#P)>i zq^wHEuOYs#FlPZeMuT@Etb@~A6feCebq`miJE3w+gAL%bVF_s*5e*@)?xmKSo%I3? zLELHVdWia$}~s6 zr!^LfxSSB4Td&9iTXrzQpl5ZDo#SdmNr;23QsPHQ!x!UT9xtb!Ycz^JF8x)%cFOXK z^EXw%dRz_VD}7?RU^4{)1+xFO=z!EI8IUa3U*rag=1BpHX$Xi<__kSbS{y_xa*MJv z_`thq0Z^sPzjAk48ssDQj}!$N8Q$XC84(bU$t_Bm69Jf+C!h_}ep zwzpQj9sRA94<{x3{~z&ix-DwX;RAzka)4-#6ZHJqKh|SVuO|>Yrv+m30+!|sK<-|E z=)5E->#y<_1V|T1f%Af!ZYqXg}`O zI$qKOWdnclF`%_Z`WGOe{`A`l-#a?s=Q1a#@BOWmExH2;Wl`OB!B-%lq3nO{4=WO& z#k_x|N&(qzm*6S{G*|GCegF2N2ulC+(58z2DG~yUs}i8zvRf&$CJCaexJ6Xu!`qz( z)*v8*kAE#D0KCo*s{8^Rbg=`*E2MzeIt0|x55%n-gO&yX#$l=3W7-_~&(G8j1E(XB hw}tl`5K!1C(72%nnjQrp<7@!WCh47rWB+@R{{wClNUHz< diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bb8b2fc2..2a563242 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index fbd7c515..4f906e0c 100755 --- a/gradlew +++ b/gradlew @@ -130,7 +130,7 @@ fi if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath diff --git a/gradlew.bat b/gradlew.bat index a9f778a7..ac1b06f9 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -54,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -64,21 +64,6 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line @@ -86,7 +71,7 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 1f4c5a7a..012508b8 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -76,7 +76,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -146,21 +146,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 3ef68fde..6370efb0 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -76,7 +76,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -146,21 +146,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 8381fcf8..b699cfcf 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -76,7 +76,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -146,21 +146,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index a136be7a..17eca4e8 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -76,7 +76,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -146,21 +146,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 076ca5bc..ec243cea 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -73,9 +73,9 @@ - javax.mail - javax.mail-api - 1.6.2 + jakarta.mail + jakarta.mail-api + 1.6.5 compile @@ -86,8 +86,20 @@ com.sun.mail - javax.mail - 1.6.2 + imap + 1.6.5 + compile + + + jackson-module-kotlin + com.fasterxml.jackson.module + + + + + com.sun.mail + jakarta.mail + 1.6.5 compile @@ -99,7 +111,7 @@ commons-io commons-io - 2.7 + 2.8.0 compile @@ -111,7 +123,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -123,7 +135,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -151,7 +163,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -205,21 +217,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 6b2ecabe..808e40a8 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -110,7 +110,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -122,7 +122,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -150,7 +150,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -192,21 +192,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index fea4ba3a..aa0436c1 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -98,7 +98,7 @@ commons-io commons-io - 2.7 + 2.8.0 compile @@ -110,7 +110,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -122,7 +122,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -150,7 +150,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -192,21 +192,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index c3f026c6..dd77254f 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -141,7 +141,7 @@ org.springframework.security spring-security-web - 5.4.2 + 5.4.4 compile @@ -153,7 +153,7 @@ org.springframework.security spring-security-config - 5.4.2 + 5.4.4 compile @@ -165,7 +165,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -189,7 +189,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -217,7 +217,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -259,21 +259,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index f20807ed..5f001d97 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -97,7 +97,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 compile @@ -125,7 +125,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -137,7 +137,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -179,21 +179,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 09882c8e..ee2a198e 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -76,7 +76,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -88,7 +88,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -116,7 +116,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -158,21 +158,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 218216aa..d0c5711c 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -76,7 +76,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -88,7 +88,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -116,7 +116,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -158,21 +158,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index c72a0e0e..463f7a12 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -88,7 +88,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -100,7 +100,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -128,7 +128,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -170,21 +170,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 715d5c09..5c20e04a 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -61,10 +61,22 @@ + + com.oracle.ojdbc + ojdbc8 + 19.3.0.0 + compile + + + jackson-module-kotlin + com.fasterxml.jackson.module + + + org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -76,7 +88,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -104,7 +116,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -146,21 +158,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 9e01ca30..66385b98 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -76,7 +76,7 @@ org.apache.commons commons-dbcp2 - 2.7.0 + 2.8.0 compile @@ -100,7 +100,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -112,7 +112,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -140,7 +140,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -182,21 +182,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index fbc103a4..264b9a77 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.springframework.integration.samples tcp-async-bi-directional @@ -80,7 +80,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -108,7 +108,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -169,28 +169,28 @@ org.springframework.boot spring-boot-dependencies - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT import pom com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 11e861e8..1f30e1b8 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -76,7 +76,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -146,21 +146,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-SNAPSHOT + 5.5.0-M2 import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index 8740548a..c886c5c4 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.springframework.integration.samples testcontainers-rabbitmq @@ -91,7 +91,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -119,7 +119,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -183,7 +183,7 @@ org.testcontainers junit-jupiter - 1.13.0 + 1.15.2 test @@ -237,28 +237,28 @@ org.springframework.boot spring-boot-dependencies - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT import pom com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index b3ee9226..a73dc30a 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -86,7 +86,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -98,7 +98,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -126,7 +126,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -168,21 +168,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index c83211e1..a11bb7f7 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -87,7 +87,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -99,7 +99,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -127,7 +127,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -169,21 +169,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/settings.gradle b/settings.gradle index 0c439f88..7e8f229c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,7 +4,7 @@ rootProject.name = 'spring-integration-samples' def projectDir = new File(rootDir, it) include ":${it}" projectDir.eachDir { dir -> - if (!dir.name.startsWith('.')) { + if (!dir.name.startsWith('.') && 'splunk' != dir.name) { include ":${dir.name}" project(":${dir.name}").projectDir = new File(projectDir.absolutePath, dir.name) if ('cafe' == dir.name) {