Skip to content

Commit 60a617d

Browse files
committed
Upgrade dependencies including Gradle
* Fix `rawtypes` warning in the `PartitionedChannelTests` * Fix deprecation warning in the `KafkaMessageSource` * Remove JUnit 4 classes and dependency *
1 parent f86c424 commit 60a617d

File tree

9 files changed

+9
-437
lines changed

9 files changed

+9
-437
lines changed

build.gradle

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
ext.kotlinVersion = '2.2.21'
2+
ext.kotlinVersion = '2.3.0'
33
ext.isCI = System.getenv('GITHUB_ACTION')
44
repositories {
55
gradlePluginPortal()
@@ -77,7 +77,6 @@ ext {
7777
jpaApiVersion = '3.2.0'
7878
jrubyVersion = '10.0.2.0'
7979
jsonpathVersion = '2.10.0'
80-
junit4Version = '4.13.2'
8180
junitJupiterVersion = '6.0.1'
8281
junitPioneerVersion = '2.3.0'
8382
kotlinCoroutinesVersion = '1.10.2'
@@ -101,7 +100,7 @@ ext {
101100
rsocketVersion = '1.1.5'
102101
servletApiVersion = '6.1.0'
103102
smackVersion = '4.4.8'
104-
springAmqpVersion = '4.0.1'
103+
springAmqpVersion = '4.1.0-SNAPSHOT'
105104
springDataVersion = '2025.1.1'
106105
springGraphqlVersion = '2.0.1'
107106
springKafkaVersion = '4.0.1'
@@ -326,7 +325,7 @@ configure(javaProjects) { subproject ->
326325

327326
checkstyle {
328327
configDirectory.set(rootProject.file('src/checkstyle'))
329-
toolVersion = project.hasProperty('checkstyleVersion') ? project.checkstyleVersion : '12.1.2'
328+
toolVersion = project.hasProperty('checkstyleVersion') ? project.checkstyleVersion : '12.3.0'
330329
}
331330

332331
jar {
@@ -434,9 +433,7 @@ project('spring-integration-test-support') {
434433
api 'org.springframework:spring-context'
435434
api 'org.springframework:spring-messaging'
436435
api 'org.springframework:spring-test'
437-
optionalApi("junit:junit:$junit4Version") {
438-
exclude group: 'org.hamcrest'
439-
}
436+
440437
optionalApi 'org.junit.jupiter:junit-jupiter-api'
441438
optionalApi 'org.apache.logging.log4j:log4j-core'
442439
}

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=df67a32e86e3276d011735facb1535f64d0d88df84fa87521e90becc2d735444
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
3+
distributionSha256Sum=72f44c9f8ebcb1af43838f45ee5c4aa9c5444898b3468ab3f4af7b6076c5bc3f
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

spring-integration-core/src/test/java/org/springframework/integration/channel/PartitionedChannelTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ public void afterMessageHandled(Message<?> message, MessageChannel ch, MessageHa
154154
PartitionedChannel testChannel;
155155

156156
@Test
157+
@SuppressWarnings({ "unchecked", "rawtypes" })
157158
void messagesArePartitionedByCorrelationId() {
158159
this.inputChannel.send(new GenericMessage<>(IntStream.range(0, 5).toArray()));
159160

@@ -164,7 +165,6 @@ void messagesArePartitionedByCorrelationId() {
164165
.asInstanceOf(InstanceOfAssertFactories.LIST)
165166
.hasSize(5);
166167

167-
@SuppressWarnings("unchecked")
168168
Set<String> strings = new HashSet<>((Collection<? extends String>) receive.getPayload());
169169
assertThat(strings).hasSize(1)
170170
.allMatch(value -> value.startsWith("testChannel-partition-thread-"));

spring-integration-kafka/src/main/java/org/springframework/integration/kafka/inbound/KafkaMessageSource.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -625,10 +625,10 @@ record = this.recordsIterator.next();
625625

626626
private Object recordToMessage(ConsumerRecord<K, V> record) {
627627
if (record.value() == null && this.checkNullValueForExceptions) {
628-
checkDeserializationException(record, SerializationUtils.VALUE_DESERIALIZER_EXCEPTION_HEADER);
628+
checkDeserializationException(record, KafkaUtils.VALUE_DESERIALIZER_EXCEPTION_HEADER);
629629
}
630630
if (record.key() == null && this.checkNullKeyForExceptions) {
631-
checkDeserializationException(record, SerializationUtils.KEY_DESERIALIZER_EXCEPTION_HEADER);
631+
checkDeserializationException(record, KafkaUtils.KEY_DESERIALIZER_EXCEPTION_HEADER);
632632
}
633633

634634
TopicPartition topicPartition = new TopicPartition(record.topic(), record.partition());

spring-integration-test-support/src/main/java/org/springframework/integration/test/rule/Log4j2LevelAdjuster.java

Lines changed: 0 additions & 190 deletions
This file was deleted.

spring-integration-test-support/src/main/java/org/springframework/integration/test/rule/package-info.java

Lines changed: 0 additions & 5 deletions
This file was deleted.

spring-integration-test-support/src/main/java/org/springframework/integration/test/support/AbstractRequestResponseScenarioTests.java

Lines changed: 0 additions & 114 deletions
This file was deleted.

0 commit comments

Comments
 (0)