Upgrade dependencies including Gradle

* Some Gradle script clean up
* disable Splunk sample since there is no `splunk`
artifact in any reasonable repository
This commit is contained in:
Artem Bilan
2021-02-18 11:56:46 -05:00
parent 0aadc6538c
commit 85fa429a11
72 changed files with 722 additions and 661 deletions

View File

@@ -87,7 +87,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -99,7 +99,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -127,7 +127,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -169,21 +169,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -76,7 +76,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -104,7 +104,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -146,21 +146,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>dynamic-tcp-client</artifactId>
@@ -80,7 +80,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -108,7 +108,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -169,28 +169,28 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -97,7 +97,7 @@
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby-complete</artifactId>
<version>9.2.13.0</version>
<version>9.2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -133,7 +133,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -145,7 +145,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -173,7 +173,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -215,21 +215,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -76,7 +76,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -88,7 +88,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -116,7 +116,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -158,21 +158,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
<version>5.16.0</version>
<version>5.16.1</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -77,7 +77,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-kahadb-store</artifactId>
<version>5.16.0</version>
<version>5.16.1</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -116,7 +116,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -128,7 +128,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -156,7 +156,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -198,21 +198,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -75,7 +75,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -87,7 +87,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -115,7 +115,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -157,21 +157,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>file-split-ftp</artifactId>
@@ -111,9 +111,9 @@
</exclusions>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>javax.mail-api</artifactId>
<version>1.6.2</version>
<groupId>jakarta.mail</groupId>
<artifactId>jakarta.mail-api</artifactId>
<version>1.6.5</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -124,8 +124,20 @@
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
<version>1.6.2</version>
<artifactId>imap</artifactId>
<version>1.6.5</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<artifactId>jackson-module-kotlin</artifactId>
<groupId>com.fasterxml.jackson.module</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>jakarta.mail</artifactId>
<version>1.6.5</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -137,7 +149,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -165,7 +177,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -226,28 +238,28 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -76,7 +76,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -104,7 +104,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -146,21 +146,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -165,7 +165,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
<version>2.7.0</version>
<version>2.8.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -297,7 +297,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<version>5.4.25.Final</version>
<version>5.4.28.Final</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -321,7 +321,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.25</version>
<version>1.7.30</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -333,7 +333,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -345,7 +345,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.25</version>
<version>1.7.30</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -357,7 +357,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.25</version>
<version>1.7.30</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -369,7 +369,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -397,7 +397,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -439,21 +439,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>stomp-chat</artifactId>
@@ -102,7 +102,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -130,7 +130,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -191,28 +191,28 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -75,7 +75,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -87,7 +87,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jcl</artifactId>
<version>1.7.25</version>
<version>1.7.30</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -99,7 +99,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -127,7 +127,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -169,21 +169,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>barrier</artifactId>
@@ -113,7 +113,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -141,7 +141,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -202,28 +202,28 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -76,7 +76,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -104,7 +104,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -146,21 +146,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -76,7 +76,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -88,7 +88,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -116,7 +116,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -158,21 +158,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -76,7 +76,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -104,7 +104,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -146,21 +146,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -76,7 +76,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -104,7 +104,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -146,21 +146,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -64,7 +64,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.7</version>
<version>2.8.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -88,7 +88,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.25</version>
<version>1.7.30</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -100,7 +100,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.25</version>
<version>1.7.30</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -112,7 +112,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -140,7 +140,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -167,7 +167,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -194,21 +194,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -76,7 +76,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -104,7 +104,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -146,21 +146,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -98,7 +98,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.7</version>
<version>2.8.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -108,9 +108,9 @@
</exclusions>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>javax.mail-api</artifactId>
<version>1.6.2</version>
<groupId>jakarta.mail</groupId>
<artifactId>jakarta.mail-api</artifactId>
<version>1.6.5</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -121,8 +121,20 @@
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
<version>1.6.2</version>
<artifactId>imap</artifactId>
<version>1.6.5</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<artifactId>jackson-module-kotlin</artifactId>
<groupId>com.fasterxml.jackson.module</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>jakarta.mail</artifactId>
<version>1.6.5</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -134,7 +146,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -146,7 +158,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -174,7 +186,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -216,21 +228,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -76,7 +76,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -88,7 +88,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -116,7 +116,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -158,21 +158,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -87,7 +87,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
<version>5.16.0</version>
<version>5.16.1</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -99,7 +99,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-kahadb-store</artifactId>
<version>5.16.0</version>
<version>5.16.1</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -115,7 +115,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -127,7 +127,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -155,7 +155,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -197,21 +197,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -75,7 +75,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -87,7 +87,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -115,7 +115,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -157,21 +157,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>jpa</artifactId>
@@ -115,7 +115,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -143,7 +143,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -204,28 +204,28 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>kafka</artifactId>
@@ -95,7 +95,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -107,7 +107,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -135,7 +135,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -196,28 +196,28 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -73,9 +73,9 @@
</exclusions>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>javax.mail-api</artifactId>
<version>1.6.2</version>
<groupId>jakarta.mail</groupId>
<artifactId>jakarta.mail-api</artifactId>
<version>1.6.5</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -86,8 +86,20 @@
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
<version>1.6.2</version>
<artifactId>imap</artifactId>
<version>1.6.5</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<artifactId>jackson-module-kotlin</artifactId>
<groupId>com.fasterxml.jackson.module</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>jakarta.mail</artifactId>
<version>1.6.5</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -99,7 +111,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -111,7 +123,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -139,7 +151,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -181,21 +193,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -76,7 +76,7 @@
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongodb-driver-sync</artifactId>
<version>4.1.1</version>
<version>4.2.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -88,7 +88,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -116,7 +116,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -158,21 +158,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>mqtt</artifactId>
@@ -91,7 +91,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -119,7 +119,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -180,28 +180,28 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -76,7 +76,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -104,7 +104,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -146,21 +146,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -76,7 +76,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -104,7 +104,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -146,21 +146,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -76,7 +76,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -104,7 +104,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -158,21 +158,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -75,7 +75,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.25</version>
<version>1.7.30</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -87,7 +87,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -99,7 +99,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.25</version>
<version>1.7.30</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -111,7 +111,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -139,7 +139,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -181,21 +181,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>tcp-broadcast</artifactId>
@@ -91,7 +91,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -119,7 +119,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -180,28 +180,28 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -87,7 +87,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -99,7 +99,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -127,7 +127,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -158,21 +158,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>tcp-with-headers</artifactId>
@@ -91,7 +91,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -119,7 +119,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -180,28 +180,28 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -97,7 +97,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -109,7 +109,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -137,7 +137,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -179,21 +179,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -77,7 +77,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -105,7 +105,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -147,21 +147,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>web-sockets</artifactId>
@@ -80,7 +80,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -108,7 +108,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -169,28 +169,28 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -86,7 +86,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -98,7 +98,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -126,7 +126,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -168,21 +168,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -75,7 +75,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -87,7 +87,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -115,7 +115,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -157,21 +157,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -76,7 +76,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -104,7 +104,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -146,21 +146,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -76,7 +76,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -104,7 +104,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -146,21 +146,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -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
}
}

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>cafe-dsl</artifactId>
@@ -92,7 +92,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -120,7 +120,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -181,28 +181,28 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>kafka-dsl</artifactId>
@@ -91,7 +91,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -103,7 +103,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -131,7 +131,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -192,28 +192,28 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -51,7 +51,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -121,21 +121,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>si4demo</artifactId>
@@ -123,9 +123,9 @@
</exclusions>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>javax.mail-api</artifactId>
<version>1.6.2</version>
<groupId>jakarta.mail</groupId>
<artifactId>jakarta.mail-api</artifactId>
<version>1.6.5</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -136,8 +136,20 @@
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
<version>1.6.2</version>
<artifactId>imap</artifactId>
<version>1.6.5</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<artifactId>jackson-module-kotlin</artifactId>
<groupId>com.fasterxml.jackson.module</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>jakarta.mail</artifactId>
<version>1.6.5</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -161,7 +173,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -189,7 +201,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -250,28 +262,28 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -1,3 +1,3 @@
version=5.4.0
springBootVersion=2.4.0-SNAPSHOT
springBootVersion=2.5.0-SNAPSHOT
org.gradle.jvmargs=-Xmx1536m

Binary file not shown.

View File

@@ -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

2
gradlew vendored
View File

@@ -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

21
gradlew.bat vendored
View File

@@ -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

View File

@@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -76,7 +76,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -104,7 +104,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -146,21 +146,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -76,7 +76,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -104,7 +104,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -146,21 +146,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -76,7 +76,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -104,7 +104,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -146,21 +146,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -76,7 +76,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -104,7 +104,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -146,21 +146,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -73,9 +73,9 @@
</exclusions>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>javax.mail-api</artifactId>
<version>1.6.2</version>
<groupId>jakarta.mail</groupId>
<artifactId>jakarta.mail-api</artifactId>
<version>1.6.5</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -86,8 +86,20 @@
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
<version>1.6.2</version>
<artifactId>imap</artifactId>
<version>1.6.5</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<artifactId>jackson-module-kotlin</artifactId>
<groupId>com.fasterxml.jackson.module</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>jakarta.mail</artifactId>
<version>1.6.5</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -99,7 +111,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.7</version>
<version>2.8.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -111,7 +123,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -123,7 +135,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -151,7 +163,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -205,21 +217,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -110,7 +110,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -122,7 +122,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -150,7 +150,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -192,21 +192,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -98,7 +98,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.7</version>
<version>2.8.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -110,7 +110,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -122,7 +122,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -150,7 +150,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -192,21 +192,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -141,7 +141,7 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId>
<version>5.4.2</version>
<version>5.4.4</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -153,7 +153,7 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
<version>5.4.2</version>
<version>5.4.4</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -165,7 +165,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -189,7 +189,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -217,7 +217,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -259,21 +259,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -97,7 +97,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -125,7 +125,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -137,7 +137,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -179,21 +179,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -76,7 +76,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -88,7 +88,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -116,7 +116,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -158,21 +158,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -76,7 +76,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -88,7 +88,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -116,7 +116,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -158,21 +158,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -88,7 +88,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -100,7 +100,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -128,7 +128,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -170,21 +170,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -61,10 +61,22 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.oracle.ojdbc</groupId>
<artifactId>ojdbc8</artifactId>
<version>19.3.0.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<artifactId>jackson-module-kotlin</artifactId>
<groupId>com.fasterxml.jackson.module</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -76,7 +88,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -104,7 +116,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -146,21 +158,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -76,7 +76,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
<version>2.7.0</version>
<version>2.8.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -100,7 +100,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -112,7 +112,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -140,7 +140,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -182,21 +182,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>tcp-async-bi-directional</artifactId>
@@ -80,7 +80,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -108,7 +108,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -169,28 +169,28 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -76,7 +76,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -104,7 +104,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -146,21 +146,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-SNAPSHOT</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>testcontainers-rabbitmq</artifactId>
@@ -91,7 +91,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -119,7 +119,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -183,7 +183,7 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
<version>1.13.0</version>
<version>1.15.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -237,28 +237,28 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -86,7 +86,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -98,7 +98,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -126,7 +126,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -168,21 +168,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -87,7 +87,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -99,7 +99,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -127,7 +127,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.6</version>
<version>3.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -169,21 +169,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.3</version>
<version>5.3.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.5.0-M1</version>
<version>5.5.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -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) {