Skip to content

Commit f5ab0c1

Browse files
committed
Upgrade dependencies; fix compatibilities
* Fix new Checkstyle rules violations
1 parent 627a797 commit f5ab0c1

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

build.gradle

+17-17
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ ext {
4848
files(grgit.status().unstaged.modified).filter { f -> f.name.endsWith('.java') || f.name.endsWith('.kt') }
4949

5050
apacheSshdVersion = '2.8.0'
51-
artemisVersion = '2.20.0'
52-
aspectjVersion = '1.9.8'
51+
artemisVersion = '2.22.0'
52+
aspectjVersion = '1.9.9.1'
5353
assertjVersion = '3.22.0'
5454
assertkVersion = '0.25'
5555
avroVersion = '1.11.0'
@@ -65,10 +65,10 @@ ext {
6565
groovyVersion = '3.0.10'
6666
hamcrestVersion = '2.2'
6767
hazelcastVersion = '5.1.1'
68-
hibernateVersion = '5.6.7.Final'
68+
hibernateVersion = '5.6.8.Final'
6969
hsqldbVersion = '2.6.1'
7070
h2Version = '2.1.210'
71-
jacksonVersion = '2.13.2'
71+
jacksonVersion = '2.13.3'
7272
jaxbVersion = '3.0.2'
7373
jcifsVersion = '2.1.29'
7474
jeroMqVersion = '0.5.2'
@@ -84,8 +84,8 @@ ext {
8484
lettuceVersion = '6.1.8.RELEASE'
8585
log4jVersion = '2.17.2'
8686
mailVersion = '2.0.1'
87-
micrometerVersion = '1.10.0-SNAPSHOT'
88-
mockitoVersion = '4.4.0'
87+
micrometerVersion = '1.10.0-M2'
88+
mockitoVersion = '4.5.1'
8989
mongoDriverVersion = '4.6.0'
9090
mysqlVersion = '8.0.28'
9191
pahoMqttClientVersion = '1.2.5'
@@ -94,20 +94,20 @@ ext {
9494
reactorVersion = '2020.0.18'
9595
resilience4jVersion = '1.7.1'
9696
romeToolsVersion = '1.18.0'
97-
rsocketVersion = '1.1.1'
97+
rsocketVersion = '1.1.2'
9898
saajVersion = '2.0.1'
9999
servletApiVersion = '5.0.0'
100100
smackVersion = '4.4.5'
101-
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '3.0.0-SNAPSHOT'
102-
springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2022.0.0-SNAPSHOT'
101+
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '3.0.0-M3'
102+
springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2022.0.0-M4'
103103
springGraphqlVersion = '1.0.0-SNAPSHOT'
104-
springKafkaVersion = '3.0.0-SNAPSHOT'
105-
springRetryVersion = '1.3.3-SNAPSHOT'
106-
springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '6.0.0-SNAPSHOT'
107-
springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-SNAPSHOT'
108-
springWsVersion = '4.0.0-SNAPSHOT'
109-
testcontainersVersion = '1.16.3'
110-
tomcatVersion = '10.0.18'
104+
springKafkaVersion = '3.0.0-M4'
105+
springRetryVersion = '1.3.3'
106+
springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '6.0.0-M4'
107+
springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-M4'
108+
springWsVersion = '4.0.0-M2'
109+
testcontainersVersion = '1.17.1'
110+
tomcatVersion = '10.0.21'
111111
xmlUnitVersion = '2.9.0'
112112
xstreamVersion = '1.4.19'
113113

@@ -359,7 +359,7 @@ configure(javaProjects) { subproject ->
359359

360360
checkstyle {
361361
configDirectory.set(rootProject.file('src/checkstyle'))
362-
toolVersion = project.hasProperty('checkstyleVersion') ? project.checkstyleVersion : '10.0'
362+
toolVersion = project.hasProperty('checkstyleVersion') ? project.checkstyleVersion : '10.2'
363363
}
364364

365365
jar {

spring-integration-core/src/main/java/org/springframework/integration/channel/DefaultHeaderChannelRegistry.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ public synchronized void run() {
229229
}
230230

231231

232-
protected static final record MessageChannelWrapper(MessageChannel channel, long expireAt) {
232+
protected record MessageChannelWrapper(MessageChannel channel, long expireAt) {
233233

234234
}
235235

spring-integration-graphql/src/main/java/org/springframework/integration/graphql/outbound/GraphQlMessageHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ protected Object handleRequestMessage(Message<?> requestMessage) {
147147
String operationName = evaluateOperationNameExpression(requestMessage);
148148
Map<String, Object> variables = evaluateVariablesExpression(requestMessage);
149149
String id = evaluateExecutionIdExpression(requestMessage);
150-
graphQlRequest = new DefaultExecutionGraphQlRequest(query, operationName, variables, id, this.locale);
150+
graphQlRequest = new DefaultExecutionGraphQlRequest(query, operationName, variables, null, id, this.locale);
151151
}
152152

153153
return this.graphQlService.execute(graphQlRequest);

spring-integration-graphql/src/test/java/org/springframework/integration/graphql/outbound/GraphQlMessageHandlerTests.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ void testHandleMessageForQueryWithRequestInputProvided() {
106106
.thenCancel()
107107
.verifyLater();
108108

109-
ExecutionGraphQlRequest payload = new DefaultExecutionGraphQlRequest("{ testQuery { id } }", null, null,
109+
ExecutionGraphQlRequest payload = new DefaultExecutionGraphQlRequest("{ testQuery { id } }", null, null, null,
110110
UUID.randomUUID().toString(), null);
111111
this.inputChannel.send(MessageBuilder.withPayload(payload).build());
112112

@@ -160,7 +160,7 @@ void testHandleMessageForMutationWithRequestInputProvided() {
160160

161161
ExecutionGraphQlRequest payload =
162162
new DefaultExecutionGraphQlRequest("mutation { update(id: \"" + fakeId + "\") { id } }", null, null,
163-
UUID.randomUUID().toString(), null);
163+
null, UUID.randomUUID().toString(), null);
164164
this.inputChannel.send(MessageBuilder.withPayload(payload).build());
165165

166166
verifier.verify(Duration.ofSeconds(10));
@@ -198,7 +198,7 @@ void testHandleMessageForSubscriptionWithRequestInputProvided() {
198198
.verifyLater();
199199

200200
ExecutionGraphQlRequest payload =
201-
new DefaultExecutionGraphQlRequest("subscription { results { id } }", null, null,
201+
new DefaultExecutionGraphQlRequest("subscription { results { id } }", null, null, null,
202202
UUID.randomUUID().toString(), null);
203203
this.inputChannel.send(MessageBuilder.withPayload(payload).build());
204204

0 commit comments

Comments
 (0)