Upgrade dependencies; fix compatibility

This commit is contained in:
Artem Bilan
2020-12-09 16:29:20 -05:00
parent 8404de97fa
commit 59d0db7bff
68 changed files with 163 additions and 148 deletions

View File

@@ -176,14 +176,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -153,14 +153,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -53,7 +53,8 @@ public class FtpOutboundChannelAdapterSample {
}
catch (MessagingException e) {
assertThat(e.getCause().getCause().getCause(), instanceOf(UnknownHostException.class));
assertTrue(e.getCause().getCause().getCause().getMessage().startsWith("host.for.cust1"));
System.out.println(e.getCause().getCause().getCause().getMessage());
assertTrue(e.getCause().getCause().getCause().getMessage().contains("host.for.cust1"));
}
// send another so we can see in the log we don't create the ac again.
try {
@@ -61,7 +62,7 @@ public class FtpOutboundChannelAdapterSample {
}
catch (MessagingException e) {
assertThat(e.getCause().getCause().getCause(), instanceOf(UnknownHostException.class));
assertTrue(e.getCause().getCause().getCause().getMessage().startsWith("host.for.cust1"));
assertTrue(e.getCause().getCause().getCause().getMessage().contains("host.for.cust1"));
}
// send to a different customer; again, check the log to see a new ac is built
message = MessageBuilder.withPayload(file)
@@ -71,7 +72,7 @@ public class FtpOutboundChannelAdapterSample {
}
catch (MessagingException e) {
assertThat(e.getCause().getCause().getCause(), instanceOf(UnknownHostException.class));
assertTrue(e.getCause().getCause().getCause().getMessage().startsWith("host.for.cust2"));
assertTrue(e.getCause().getCause().getCause().getMessage().contains("host.for.cust2"));
}
// send to a different customer; again, check the log to see a new ac is built
@@ -83,7 +84,7 @@ public class FtpOutboundChannelAdapterSample {
}
catch (MessagingException e) {
assertThat(e.getCause().getCause().getCause(), instanceOf(UnknownHostException.class));
assertTrue(e.getCause().getCause().getCause().getMessage().startsWith("host.for.cust3"));
assertTrue(e.getCause().getCause().getCause().getMessage().contains("host.for.cust3"));
}
//send to cust1 again, since this one has been invalidated before, we should
@@ -95,7 +96,7 @@ public class FtpOutboundChannelAdapterSample {
}
catch (MessagingException e) {
assertThat(e.getCause().getCause().getCause(), instanceOf(UnknownHostException.class));
assertEquals("host.for.cust1", e.getCause().getCause().getCause().getMessage());
assertTrue(e.getCause().getCause().getCause().getMessage().contains("host.for.cust1"));
}
ctx.close();

View File

@@ -183,14 +183,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -121,7 +121,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>3.0.5</version>
<version>3.0.7</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -222,14 +222,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -165,14 +165,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -205,14 +205,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -164,14 +164,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -240,14 +240,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -153,14 +153,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -297,7 +297,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<version>5.4.20.Final</version>
<version>5.4.25.Final</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -446,14 +446,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -205,14 +205,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -176,14 +176,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -216,14 +216,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -153,14 +153,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -165,14 +165,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -153,14 +153,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -153,14 +153,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -201,14 +201,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -153,14 +153,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -223,14 +223,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -165,14 +165,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -204,14 +204,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -164,14 +164,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -218,14 +218,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -210,14 +210,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -188,14 +188,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -76,7 +76,7 @@
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongodb-driver-sync</artifactId>
<version>4.1.0</version>
<version>4.1.1</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -165,14 +165,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -194,14 +194,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -153,14 +153,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -153,14 +153,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -165,14 +165,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -195,14 +195,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -188,14 +188,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -194,14 +194,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -165,14 +165,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -194,14 +194,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -186,14 +186,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -154,14 +154,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -183,14 +183,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -175,14 +175,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -164,14 +164,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -153,14 +153,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -153,14 +153,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -180,16 +180,17 @@ subprojects { subproject ->
c3p0Version = '0.9.1.2'
derbyVersion = '10.14.2.0'
hamcrestVersion = '2.2'
hibernateVersion = '5.4.20.Final'
hibernateVersion = '5.4.25.Final'
hibernateValidatorVersion = '6.1.2.Final'
ftpServerVersion = '1.1.1'
flexjsonVersion = '2.0'
groovyVersion = '3.0.5'
groovyVersion = '3.0.7'
hsqldbVersion = '2.5.1'
h2Version = '1.4.200'
jacksonVersion = '2.11.1'
javaxInjectVersion = '1'
javaxMailVersion = '1.6.2'
jaxbVersion = '2.3.3'
jodaTimeVersion = '1.6'
jtaVersion = '1.1'
jtdsVersion = '1.2.6'
@@ -202,18 +203,18 @@ subprojects { subproject ->
jythonVersion = '2.7.2'
log4jVersion = '2.13.3'
mockitoVersion = '3.4.6'
mongoDriverVersion = '4.1.0'
mongoDriverVersion = '4.1.1'
openJpaVersion = '2.4.0'
oracleDriverVersion = '11.2.0.3'
postgresVersion = '42.2.14'
subethasmtpVersion = '1.2'
slf4jVersion = '1.7.25'
springCloudVersion ='2020.0.0-SNAPSHOT'
springIntegrationVersion = '5.4.1'
springIntegrationVersion = '5.4.2'
springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT'
springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT'
springVersion = '5.3.1'
springSecurityVersion = '5.4.1'
springVersion = '5.3.2'
springSecurityVersion = '5.4.2'
springWebFlowVersion = '2.3.3.RELEASE'
testcontainersVersion = '1.13.0'
tilesJspVersion = '2.2.1'
@@ -1160,6 +1161,7 @@ project('rest-http') {
compile "org.springframework.security:spring-security-web:$springSecurityVersion"
compile "org.springframework.security:spring-security-config:$springSecurityVersion"
compile "org.apache.logging.log4j:log4j-core:$log4jVersion"
compile "com.sun.xml.bind:jaxb-impl:$jaxbVersion"
}
test {

View File

@@ -195,14 +195,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -206,14 +206,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -128,14 +128,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -264,14 +264,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -153,14 +153,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -153,14 +153,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -153,14 +153,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -153,14 +153,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -212,14 +212,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -199,14 +199,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -199,14 +199,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</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.1</version>
<version>5.4.2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -153,7 +153,7 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -174,6 +174,18 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.3.3</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<artifactId>jackson-module-kotlin</artifactId>
<groupId>com.fasterxml.jackson.module</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -254,14 +266,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -186,14 +186,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -165,14 +165,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -165,14 +165,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -177,14 +177,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -153,14 +153,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -189,14 +189,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -183,14 +183,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -153,14 +153,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -251,14 +251,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -175,14 +175,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -176,14 +176,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.4.1</version>
<version>5.4.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>