From f200849eda6989ae1d5aa3a0a876a93b1ba3fc88 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 23 Feb 2021 14:06:57 -0500 Subject: [PATCH] Move deps back to SNAPSHOTs * Increase a `remoteTimeout` for `IpIntegrationTests.testCloseStream()` --- build.gradle | 14 +++++++------- .../integration/ip/dsl/IpIntegrationTests.java | 3 ++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 2c826f4454..a363b9fc13 100644 --- a/build.gradle +++ b/build.gradle @@ -89,7 +89,7 @@ ext { pahoMqttClientVersion = '1.2.5' postgresVersion = '42.2.18' r2dbch2Version='0.8.4.RELEASE' - reactorVersion = '2020.0.3' + reactorVersion = '2020.0.4-SNAPSHOT' resilience4jVersion = '1.7.0' romeToolsVersion = '1.15.0' rsocketVersion = '1.1.0' @@ -97,13 +97,13 @@ ext { servletApiVersion = '4.0.1' smackVersion = '4.3.5' soapVersion = '1.4.0' - springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.3.5' - springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2021.0.0-M3' - springKafkaVersion = '2.7.0-M2' + springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.3.6-SNAPSHOT' + springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2021.0.0-SNAPSHOT' + springKafkaVersion = '2.7.0-SNAPSHOT' springRetryVersion = '1.3.1' - springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '5.5.0-M2' - springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.3.4' - springWsVersion = '3.1.0-M1' + springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '5.5.0-SNAPSHOT' + springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.3.5-SNAPSHOT' + springWsVersion = '3.1.0-SNAPSHOT' tomcatVersion = '9.0.43' xmlUnitVersion = '2.8.2' xstreamVersion = '1.4.15' diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/dsl/IpIntegrationTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/dsl/IpIntegrationTests.java index f5fbbbe99b..f33bf2d1de 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/dsl/IpIntegrationTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/dsl/IpIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2020 the original author or authors. + * Copyright 2016-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -225,6 +225,7 @@ public class IpIntegrationTests { .handle(Tcp.outboundGateway(Tcp.netClient("localhost", port.get()) .singleUseConnections(true) .serializer(new ByteArrayRawSerializer())) + .remoteTimeout(20_000) .closeStreamAfterSend(true)) .transform(Transformers.objectToString()) .get();