Skip to content

Commit 3e04608

Browse files
committed
Upgrade to the latest dependencies
* Use latest SNAPSHOT variants for Spring projects * Fix compilation errors after such an upgrade
1 parent 40df0b9 commit 3e04608

File tree

8 files changed

+40
-34
lines changed

8 files changed

+40
-34
lines changed

build.gradle

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ ext {
6262
assertkVersion = '0.28.1'
6363
avroVersion = '1.12.0'
6464
awaitilityVersion = '4.3.0'
65-
camelVersion = '4.11.0'
65+
camelVersion = '4.12.0'
6666
commonsDbcp2Version = '2.13.0'
6767
commonsIoVersion = '2.19.0'
6868
commonsNetVersion = '3.11.1'
@@ -75,48 +75,48 @@ ext {
7575
groovyVersion = '4.0.27'
7676
hamcrestVersion = '3.0'
7777
hazelcastVersion = '5.5.0'
78-
hibernateVersion = '6.6.17.Final'
78+
hibernateVersion = '7.0.0.Final'
7979
hsqldbVersion = '2.7.4'
8080
h2Version = '2.3.232'
8181
jacksonVersion = '2.19.0'
8282
jaxbVersion = '4.0.5'
8383
jcifsVersion = '2.1.39'
8484
jeroMqVersion = '0.6.0'
8585
jmsApiVersion = '3.1.0'
86-
jpaApiVersion = '3.1.0'
87-
jrubyVersion = '9.4.12.1'
86+
jpaApiVersion = '3.2.0'
87+
jrubyVersion = '10.0.0.1'
8888
jsonpathVersion = '2.9.0'
8989
junit4Version = '4.13.2'
9090
junitJupiterVersion = '5.12.2'
9191
kotlinCoroutinesVersion = '1.10.2'
9292
kryoVersion = '5.6.2'
93-
lettuceVersion = '6.6.0.RELEASE'
93+
lettuceVersion = '6.7.1.RELEASE'
9494
log4jVersion = '2.24.3'
9595
mailVersion = '2.0.3'
9696
micrometerTracingVersion = '1.5.0'
9797
micrometerVersion = '1.15.0'
98-
mockitoVersion = '5.17.0'
98+
mockitoVersion = '5.18.0'
9999
mongoDriverVersion = '5.5.0'
100100
mysqlVersion = '9.3.0'
101101
oracleVersion = '23.8.0.25.04'
102102
pahoMqttClientVersion = '1.2.5'
103103
postgresVersion = '42.7.6'
104104
protobufVersion = '4.31.1'
105105
r2dbch2Version = '1.0.0.RELEASE'
106-
reactorVersion = '2024.0.6'
106+
reactorVersion = '2025.0.0-SNAPSHOT'
107107
resilience4jVersion = '2.3.0'
108108
romeToolsVersion = '2.1.0'
109109
rsocketVersion = '1.1.5'
110110
servletApiVersion = '6.1.0'
111111
smackVersion = '4.4.8'
112-
springAmqpVersion = '3.2.5'
112+
springAmqpVersion = '4.0.0-SNAPSHOT'
113113
springDataVersion = '2025.1.0-SNAPSHOT'
114114
springGraphqlVersion = '1.4.0'
115-
springKafkaVersion = '3.3.6'
115+
springKafkaVersion = '4.0.0-SNAPSHOT'
116116
springRetryVersion = '2.0.12'
117117
springSecurityVersion = '7.0.0-SNAPSHOT'
118118
springVersion = '7.0.0-SNAPSHOT'
119-
springWsVersion = '4.1.0'
119+
springWsVersion = '5.0.0-SNAPSHOT'
120120
testcontainersVersion = '1.21.1'
121121
tomcatVersion = '11.0.7'
122122
xmlUnitVersion = '2.10.2'
@@ -137,6 +137,7 @@ allprojects {
137137
maven { url 'https://repo.spring.io/milestone' }
138138
if (version.endsWith('SNAPSHOT')) {
139139
maven { url 'https://repo.spring.io/snapshot' }
140+
maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
140141
}
141142
// maven { url 'https://repo.spring.io/libs-staging-local' }
142143
}
@@ -384,7 +385,7 @@ configure(javaProjects) { subproject ->
384385

385386
checkstyle {
386387
configDirectory.set(rootProject.file('src/checkstyle'))
387-
toolVersion = project.hasProperty('checkstyleVersion') ? project.checkstyleVersion : '10.23.1'
388+
toolVersion = project.hasProperty('checkstyleVersion') ? project.checkstyleVersion : '10.25.0'
388389
}
389390

390391
jar {

spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/AmqpMessageSourceTests.java

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848

4949
/**
5050
* @author Gary Russell
51+
* @author Artem Bilan
5152
*
5253
* @since 5.0.1
5354
*
@@ -59,7 +60,10 @@ public void testAck() throws Exception {
5960
Channel channel = mock(Channel.class);
6061
willReturn(true).given(channel).isOpen();
6162
Envelope envelope = new Envelope(123L, false, "ex", "rk");
62-
BasicProperties props = new BasicProperties.Builder().build();
63+
BasicProperties props =
64+
new BasicProperties.Builder()
65+
.contentType(MessageProperties.DEFAULT_CONTENT_TYPE)
66+
.build();
6367
GetResponse getResponse = new GetResponse(envelope, props, "bar".getBytes(), 0);
6468
willReturn(getResponse).given(channel).basicGet("foo", false);
6569
Connection connection = mock(Connection.class);
@@ -107,7 +111,10 @@ private void testNackOrRequeue(boolean requeue) throws Exception {
107111
Channel channel = mock(Channel.class);
108112
willReturn(true).given(channel).isOpen();
109113
Envelope envelope = new Envelope(123L, false, "ex", "rk");
110-
BasicProperties props = new BasicProperties.Builder().build();
114+
BasicProperties props =
115+
new BasicProperties.Builder()
116+
.contentType(MessageProperties.DEFAULT_CONTENT_TYPE)
117+
.build();
111118
GetResponse getResponse = new GetResponse(envelope, props, "bar".getBytes(), 0);
112119
willReturn(getResponse).given(channel).basicGet("foo", false);
113120
Connection connection = mock(Connection.class);
@@ -145,10 +152,10 @@ public void testBatch() throws Exception {
145152
willReturn(true).given(channel).isOpen();
146153
Envelope envelope = new Envelope(123L, false, "ex", "rk");
147154
BasicProperties props = new BasicProperties.Builder()
148-
.headers(batched.getMessage().getMessageProperties().getHeaders())
155+
.headers(batched.message().getMessageProperties().getHeaders())
149156
.contentType("text/plain")
150157
.build();
151-
GetResponse getResponse = new GetResponse(envelope, props, batched.getMessage().getBody(), 0);
158+
GetResponse getResponse = new GetResponse(envelope, props, batched.message().getBody(), 0);
152159
willReturn(getResponse).given(channel).basicGet("foo", false);
153160
Connection connection = mock(Connection.class);
154161
willReturn(true).given(connection).isOpen();

spring-integration-jpa/src/test/java/org/springframework/integration/jpa/core/HibernateJpaOperationsTests.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2024 the original author or authors.
2+
* Copyright 2002-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
1818

1919
import java.text.ParseException;
2020
import java.text.SimpleDateFormat;
21+
import java.time.LocalDate;
2122
import java.util.ArrayList;
2223
import java.util.List;
2324

@@ -168,13 +169,11 @@ public void testExecuteSelectWithNativeQuery() throws ParseException {
168169

169170
Object[] retrievedStudent = (Object[]) students.iterator().next();
170171

171-
SimpleDateFormat formatter = new SimpleDateFormat("yyyy/MM/dd");
172-
173172
assertThat(retrievedStudent[0]).isNotNull();
174173
assertThat(retrievedStudent[1]).isEqualTo("First One");
175174
assertThat(retrievedStudent[2]).isEqualTo("Last One");
176175
assertThat(retrievedStudent[3]).isEqualTo("M");
177-
assertThat(retrievedStudent[4]).isEqualTo(formatter.parse("1980/01/01"));
176+
assertThat(retrievedStudent[4]).isEqualTo(LocalDate.parse("1980-01-01"));
178177
assertThat(retrievedStudent[5]).isNotNull();
179178

180179
}

spring-integration-jpa/src/test/java/org/springframework/integration/jpa/outbound/JpaOutboundGatewayTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2024 the original author or authors.
2+
* Copyright 2002-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -82,7 +82,7 @@ public void deleteNonExistingStudent() {
8282
student.setRollNumber(3424234234L);
8383
assertThatIllegalArgumentException()
8484
.isThrownBy(() -> studentService.deleteStudent(student))
85-
.withMessageStartingWith("Removing a detached instance");
85+
.withMessageStartingWith("Given entity is not associated with the persistence context");
8686
}
8787

8888
@Test

spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaOutboundAdapterParserTests.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2013-2024 the original author or authors.
2+
* Copyright 2013-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@
2727
import org.apache.kafka.clients.producer.ProducerConfig;
2828
import org.apache.kafka.common.serialization.IntegerSerializer;
2929
import org.apache.kafka.common.serialization.StringSerializer;
30+
import org.apache.kafka.test.MockPartitioner;
3031
import org.junit.jupiter.api.Test;
3132

3233
import org.springframework.beans.factory.BeanFactory;
@@ -102,7 +103,7 @@ void testOutboundAdapterConfiguration() {
102103
@Test
103104
void testSyncMode() {
104105
MockProducer<Integer, String> mockProducer =
105-
new MockProducer<>(false, new IntegerSerializer(), new StringSerializer()) {
106+
new MockProducer<>(false, new MockPartitioner(), new IntegerSerializer(), new StringSerializer()) {
106107

107108
@Override
108109
public void close(Duration timeout) {
@@ -128,12 +129,12 @@ public void close(Duration timeout) {
128129

129130
ExecutorService executorService = Executors.newSingleThreadExecutor();
130131
executorService.submit(() -> {
131-
RuntimeException exception = new RuntimeException("Async Producer Mock exception");
132-
while (!mockProducer.errorNext(exception)) {
133-
Thread.sleep(100);
134-
}
135-
return null;
136-
});
132+
RuntimeException exception = new RuntimeException("Async Producer Mock exception");
133+
while (!mockProducer.errorNext(exception)) {
134+
Thread.sleep(100);
135+
}
136+
return null;
137+
});
137138

138139
assertThatExceptionOfType(MessageHandlingException.class)
139140
.isThrownBy(() -> handler.handleMessage(new GenericMessage<>("foo")))

spring-integration-kafka/src/test/java/org/springframework/integration/kafka/inbound/InboundGatewayTests.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2018-2023 the original author or authors.
2+
* Copyright 2018-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -76,7 +76,6 @@
7676
*
7777
*/
7878
@EmbeddedKafka(controlledShutdown = true,
79-
kraft = false,
8079
topics = {InboundGatewayTests.topic1,
8180
InboundGatewayTests.topic2,
8281
InboundGatewayTests.topic3,

spring-integration-kafka/src/test/kotlin/org/springframework/integration/kafka/dsl/kotlin/KafkaDslKotlinTests.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2018-2023 the original author or authors.
2+
* Copyright 2018-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -210,7 +210,7 @@ class KafkaDslKotlinTests {
210210

211211
@Bean
212212
fun consumerFactory(): ConsumerFactory<Int, String> {
213-
val props = KafkaTestUtils.consumerProps(this.embeddedKafkaBrokers, "kotlin-group-test1", "false")
213+
val props = KafkaTestUtils.consumerProps(this.embeddedKafkaBrokers, "kotlin-group-test1", false)
214214
props[ConsumerConfig.AUTO_OFFSET_RESET_CONFIG] = "earliest"
215215
return DefaultKafkaConsumerFactory(props)
216216
}

src/checkstyle/checkstyle.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@
8787
org.mockito.AdditionalAnswers.*,
8888
org.mockito.ArgumentMatchers.*,
8989
org.mockito.AdditionalMatchers.*,
90-
org.springframework.integration.gemfire.config.xml.ParserTestUtil.*,
9190
org.springframework.kafka.test.assertj.KafkaConditions.*,
9291
org.springframework.integration.test.mock.MockIntegration.*,
9392
org.springframework.integration.test.util.TestUtils.*,

0 commit comments

Comments
 (0)