diff --git a/build.gradle b/build.gradle index a716882593..375f11c0fd 100644 --- a/build.gradle +++ b/build.gradle @@ -48,8 +48,8 @@ ext { files(grgit.status().unstaged.modified).filter { f -> f.name.endsWith('.java') || f.name.endsWith('.kt') } apacheSshdVersion = '2.8.0' - artemisVersion = '2.20.0' - aspectjVersion = '1.9.8' + artemisVersion = '2.22.0' + aspectjVersion = '1.9.9.1' assertjVersion = '3.22.0' assertkVersion = '0.25' avroVersion = '1.11.0' @@ -65,10 +65,10 @@ ext { groovyVersion = '3.0.10' hamcrestVersion = '2.2' hazelcastVersion = '5.1.1' - hibernateVersion = '5.6.7.Final' + hibernateVersion = '5.6.8.Final' hsqldbVersion = '2.6.1' h2Version = '2.1.210' - jacksonVersion = '2.13.2' + jacksonVersion = '2.13.3' jaxbVersion = '3.0.2' jcifsVersion = '2.1.29' jeroMqVersion = '0.5.2' @@ -84,8 +84,8 @@ ext { lettuceVersion = '6.1.8.RELEASE' log4jVersion = '2.17.2' mailVersion = '2.0.1' - micrometerVersion = '1.10.0-SNAPSHOT' - mockitoVersion = '4.4.0' + micrometerVersion = '1.10.0-M2' + mockitoVersion = '4.5.1' mongoDriverVersion = '4.6.0' mysqlVersion = '8.0.28' pahoMqttClientVersion = '1.2.5' @@ -94,20 +94,20 @@ ext { reactorVersion = '2020.0.18' resilience4jVersion = '1.7.1' romeToolsVersion = '1.18.0' - rsocketVersion = '1.1.1' + 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-SNAPSHOT' - springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2022.0.0-SNAPSHOT' + springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '3.0.0-M3' + springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2022.0.0-M4' springGraphqlVersion = '1.0.0-SNAPSHOT' - springKafkaVersion = '3.0.0-SNAPSHOT' - springRetryVersion = '1.3.3-SNAPSHOT' - 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.16.3' - tomcatVersion = '10.0.18' + springKafkaVersion = '3.0.0-M4' + springRetryVersion = '1.3.3' + springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '6.0.0-M4' + springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-M4' + springWsVersion = '4.0.0-M2' + testcontainersVersion = '1.17.1' + tomcatVersion = '10.0.21' xmlUnitVersion = '2.9.0' xstreamVersion = '1.4.19' @@ -359,7 +359,7 @@ configure(javaProjects) { subproject -> checkstyle { configDirectory.set(rootProject.file('src/checkstyle')) - toolVersion = project.hasProperty('checkstyleVersion') ? project.checkstyleVersion : '10.0' + toolVersion = project.hasProperty('checkstyleVersion') ? project.checkstyleVersion : '10.2' } jar { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/DefaultHeaderChannelRegistry.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/DefaultHeaderChannelRegistry.java index 9d39610feb..eece643b8e 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/DefaultHeaderChannelRegistry.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/DefaultHeaderChannelRegistry.java @@ -229,7 +229,7 @@ public class DefaultHeaderChannelRegistry extends IntegrationObjectSupport } - protected static final record MessageChannelWrapper(MessageChannel channel, long expireAt) { + protected record MessageChannelWrapper(MessageChannel channel, long expireAt) { } diff --git a/spring-integration-graphql/src/main/java/org/springframework/integration/graphql/outbound/GraphQlMessageHandler.java b/spring-integration-graphql/src/main/java/org/springframework/integration/graphql/outbound/GraphQlMessageHandler.java index 56cc87b80d..7aa156a96c 100644 --- a/spring-integration-graphql/src/main/java/org/springframework/integration/graphql/outbound/GraphQlMessageHandler.java +++ b/spring-integration-graphql/src/main/java/org/springframework/integration/graphql/outbound/GraphQlMessageHandler.java @@ -147,7 +147,7 @@ public class GraphQlMessageHandler extends AbstractReplyProducingMessageHandler String operationName = evaluateOperationNameExpression(requestMessage); Map variables = evaluateVariablesExpression(requestMessage); String id = evaluateExecutionIdExpression(requestMessage); - graphQlRequest = new DefaultExecutionGraphQlRequest(query, operationName, variables, id, this.locale); + graphQlRequest = new DefaultExecutionGraphQlRequest(query, operationName, variables, null, id, this.locale); } return this.graphQlService.execute(graphQlRequest); diff --git a/spring-integration-graphql/src/test/java/org/springframework/integration/graphql/outbound/GraphQlMessageHandlerTests.java b/spring-integration-graphql/src/test/java/org/springframework/integration/graphql/outbound/GraphQlMessageHandlerTests.java index 71815ff00e..7de8c97654 100644 --- a/spring-integration-graphql/src/test/java/org/springframework/integration/graphql/outbound/GraphQlMessageHandlerTests.java +++ b/spring-integration-graphql/src/test/java/org/springframework/integration/graphql/outbound/GraphQlMessageHandlerTests.java @@ -106,7 +106,7 @@ public class GraphQlMessageHandlerTests { .thenCancel() .verifyLater(); - ExecutionGraphQlRequest payload = new DefaultExecutionGraphQlRequest("{ testQuery { id } }", null, null, + ExecutionGraphQlRequest payload = new DefaultExecutionGraphQlRequest("{ testQuery { id } }", null, null, null, UUID.randomUUID().toString(), null); this.inputChannel.send(MessageBuilder.withPayload(payload).build()); @@ -160,7 +160,7 @@ public class GraphQlMessageHandlerTests { ExecutionGraphQlRequest payload = new DefaultExecutionGraphQlRequest("mutation { update(id: \"" + fakeId + "\") { id } }", null, null, - UUID.randomUUID().toString(), null); + null, UUID.randomUUID().toString(), null); this.inputChannel.send(MessageBuilder.withPayload(payload).build()); verifier.verify(Duration.ofSeconds(10)); @@ -198,7 +198,7 @@ public class GraphQlMessageHandlerTests { .verifyLater(); ExecutionGraphQlRequest payload = - new DefaultExecutionGraphQlRequest("subscription { results { id } }", null, null, + new DefaultExecutionGraphQlRequest("subscription { results { id } }", null, null, null, UUID.randomUUID().toString(), null); this.inputChannel.send(MessageBuilder.withPayload(payload).build());