From 0422486409f7d24a3e3016ed0c9e90399a3f5d76 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Mon, 25 Jul 2022 12:27:17 -0400 Subject: [PATCH] Fix for latest compatibility --- build.gradle | 18 +++++++++--------- .../websocket/ServerWebSocketContainer.java | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index 5c23a33be0..0176146e54 100644 --- a/build.gradle +++ b/build.gradle @@ -84,29 +84,29 @@ ext { lettuceVersion = '6.2.0.RELEASE' log4jVersion = '2.18.0' mailVersion = '2.0.1' - micrometerVersion = '1.10.0-M3' - micrometerTracingVersion = '1.0.0-M6' + micrometerVersion = '1.10.0-SNAPSHOT' + micrometerTracingVersion = '1.0.0-SNAPSHOT' mockitoVersion = '4.6.1' mongoDriverVersion = '4.7.0' mysqlVersion = '8.0.29' pahoMqttClientVersion = '1.2.5' postgresVersion = '42.3.3' r2dbch2Version = '1.0.0.RC1' - reactorVersion = '2022.0.0-M4' + reactorVersion = '2022.0.0-SNAPSHOT' resilience4jVersion = '1.7.1' romeToolsVersion = '1.18.0' rsocketVersion = '1.1.2' saajVersion = '2.0.1' servletApiVersion = '5.0.0' smackVersion = '4.4.5' - springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '3.0.0-M3' - springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2022.0.0-M5' + springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '3.0.0-SNAPSHOT' + springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2022.0.0-SNAPSHOT' springGraphqlVersion = '1.0.1' - springKafkaVersion = '3.0.0-M5' + springKafkaVersion = '3.0.0-SNAPSHOT' springRetryVersion = '1.3.3' - springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '6.0.0-M6' - springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-M5' - springWsVersion = '4.0.0-M2' + springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '6.0.0-SNAPSHOT' + springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-SNAPSHOT' + springWsVersion = '4.0.0-SNAPSHOT' testcontainersVersion = '1.17.3' tomcatVersion = '10.0.21' xmlUnitVersion = '2.9.0' diff --git a/spring-integration-websocket/src/main/java/org/springframework/integration/websocket/ServerWebSocketContainer.java b/spring-integration-websocket/src/main/java/org/springframework/integration/websocket/ServerWebSocketContainer.java index 815c048e67..de7b648cfb 100644 --- a/spring-integration-websocket/src/main/java/org/springframework/integration/websocket/ServerWebSocketContainer.java +++ b/spring-integration-websocket/src/main/java/org/springframework/integration/websocket/ServerWebSocketContainer.java @@ -195,7 +195,7 @@ public class ServerWebSocketContainer extends IntegrationWebSocketContainer .acceptIfNotNull(this.sockJsServiceOptions.messageCodec, sockJsServiceRegistration::setMessageCodec) .acceptIfNotNull(this.sockJsServiceOptions.suppressCors, - sockJsServiceRegistration::setSupressCors); + sockJsServiceRegistration::setSuppressCors); } }