Skip to content

Commit 91a8b14

Browse files
artembilanartembilan
committed
Move dependencies to Milestones for release
* Adapt code to the changes in upstream libs * Change consumer groups in Kafka tests to unique values to avoid clashes
1 parent 8c73a2d commit 91a8b14

File tree

6 files changed

+65
-58
lines changed

6 files changed

+65
-58
lines changed

‎build.gradle

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ plugins {
1616
id 'org.sonarqube' version '2.8'
1717
id 'io.spring.nohttp' version '0.0.10' apply false
1818
id 'org.ajoberstar.grgit' version '4.1.1'
19-
id 'io.spring.dependency-management' version '1.0.12.RELEASE'
20-
id 'com.jfrog.artifactory' version '4.28.4' apply false
19+
id 'io.spring.dependency-management' version '1.0.13.RELEASE'
20+
id 'com.jfrog.artifactory' version '4.29.0' apply false
2121
id 'org.jetbrains.dokka' version '1.7.10'
2222
id 'org.asciidoctor.jvm.pdf' version '3.3.2'
2323
id 'org.asciidoctor.jvm.gems' version '3.3.2'
@@ -47,12 +47,12 @@ ext {
4747
modifiedFiles =
4848
files(grgit.status().unstaged.modified).filter { f -> f.name.endsWith('.java') || f.name.endsWith('.kt') }
4949

50-
apacheSshdVersion = '2.8.0'
51-
artemisVersion = '2.23.1'
50+
apacheSshdVersion = '2.9.1'
51+
artemisVersion = '2.25.0'
5252
aspectjVersion = '1.9.9.1'
5353
assertjVersion = '3.23.1'
5454
assertkVersion = '0.25'
55-
avroVersion = '1.11.0'
55+
avroVersion = '1.11.1'
5656
awaitilityVersion = '4.2.0'
5757
camelVersion = '3.18.2'
5858
commonsDbcp2Version = '2.9.0'
@@ -63,53 +63,53 @@ ext {
6363
findbugsVersion = '3.0.1'
6464
ftpServerVersion = '1.2.0'
6565
greenmailVersion = '2.0.0-alpha-2'
66-
groovyVersion = '3.0.11'
66+
groovyVersion = '3.0.13'
6767
hamcrestVersion = '2.2'
68-
hazelcastVersion = '5.1.2'
69-
hibernateVersion = '6.1.1.Final'
70-
hsqldbVersion = '2.6.1'
71-
h2Version = '2.1.212'
72-
jacksonVersion = '2.13.3'
68+
hazelcastVersion = '5.1.3'
69+
hibernateVersion = '6.1.3.Final'
70+
hsqldbVersion = '2.7.0'
71+
h2Version = '2.1.214'
72+
jacksonVersion = '2.13.4'
7373
jaxbVersion = '3.0.2'
74-
jcifsVersion = '2.1.31'
74+
jcifsVersion = '2.1.32'
7575
jeroMqVersion = '0.5.2'
7676
jmsApiVersion = '3.0.0'
77-
jpaApiVersion = '3.0.2'
78-
jrubyVersion = '9.3.3.0'
77+
jpaApiVersion = '3.0.3'
78+
jrubyVersion = '9.3.8.0'
7979
jschVersion = '0.1.55'
8080
jsonpathVersion = '2.7.0'
8181
junit4Version = '4.13.2'
82-
junitJupiterVersion = '5.8.2'
83-
jythonVersion = '2.7.2'
82+
junitJupiterVersion = '5.9.0'
83+
jythonVersion = '2.7.3'
8484
kryoVersion = '5.3.0'
8585
lettuceVersion = '6.2.0.RELEASE'
86-
log4jVersion = '2.18.0'
86+
log4jVersion = '2.19.0'
8787
mailVersion = '2.0.1'
88-
micrometerVersion = '1.10.0-SNAPSHOT'
89-
micrometerTracingVersion = '1.0.0-SNAPSHOT'
90-
mockitoVersion = '4.6.1'
91-
mongoDriverVersion = '4.7.0'
92-
mysqlVersion = '8.0.29'
88+
micrometerVersion = '1.10.0-M6'
89+
micrometerTracingVersion = '1.0.0-M8'
90+
mockitoVersion = '4.8.0'
91+
mongoDriverVersion = '4.7.1'
92+
mysqlVersion = '8.0.30'
9393
pahoMqttClientVersion = '1.2.5'
94-
postgresVersion = '42.3.3'
94+
postgresVersion = '42.5.0'
9595
r2dbch2Version = '1.0.0.RC1'
96-
reactorVersion = '2022.0.0-SNAPSHOT'
96+
reactorVersion = '2022.0.0-M6'
9797
resilience4jVersion = '1.7.1'
9898
romeToolsVersion = '1.18.0'
99-
rsocketVersion = '1.1.2'
100-
saajVersion = '2.0.1'
99+
rsocketVersion = '1.1.3'
100+
saajVersion = '3.0.0'
101101
servletApiVersion = '5.0.0'
102-
smackVersion = '4.4.5'
103-
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '3.0.0-SNAPSHOT'
104-
springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2022.0.0-SNAPSHOT'
105-
springGraphqlVersion = '1.0.1'
106-
springKafkaVersion = '3.0.0-SNAPSHOT'
107-
springRetryVersion = '1.3.3'
108-
springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '6.0.0-SNAPSHOT'
109-
springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-SNAPSHOT'
110-
springWsVersion = '4.0.0-SNAPSHOT'
102+
smackVersion = '4.4.6'
103+
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '3.0.0-M4'
104+
springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2022.0.0-M6'
105+
springGraphqlVersion = '1.1.0-M1'
106+
springKafkaVersion = '3.0.0-M6'
107+
springRetryVersion = '2.0.0-M1'
108+
springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '6.0.0-M7'
109+
springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-M6'
110+
springWsVersion = '4.0.0-M2'
111111
testcontainersVersion = '1.17.3'
112-
tomcatVersion = '10.0.21'
112+
tomcatVersion = '10.0.23'
113113
xmlUnitVersion = '2.9.0'
114114
xstreamVersion = '1.4.19'
115115

@@ -362,7 +362,7 @@ configure(javaProjects) { subproject ->
362362

363363
checkstyle {
364364
configDirectory.set(rootProject.file('src/checkstyle'))
365-
toolVersion = project.hasProperty('checkstyleVersion') ? project.checkstyleVersion : '10.2'
365+
toolVersion = project.hasProperty('checkstyleVersion') ? project.checkstyleVersion : '10.3.3'
366366
}
367367

368368
jar {

‎spring-integration-core/src/test/java/org/springframework/integration/config/xml/RetryAdviceParserTests.java

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2014-2019 the original author or authors.
2+
* Copyright 2014-2022 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.
@@ -20,17 +20,16 @@
2020

2121
import java.util.List;
2222

23-
import org.junit.Test;
24-
import org.junit.runner.RunWith;
23+
import org.junit.jupiter.api.Test;
2524

2625
import org.springframework.beans.factory.annotation.Autowired;
2726
import org.springframework.beans.factory.annotation.Qualifier;
2827
import org.springframework.integration.handler.advice.RequestHandlerRetryAdvice;
2928
import org.springframework.integration.test.util.TestUtils;
3029
import org.springframework.messaging.MessageChannel;
3130
import org.springframework.messaging.MessageHandler;
32-
import org.springframework.test.context.ContextConfiguration;
33-
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
31+
import org.springframework.retry.backoff.FixedBackOffPolicy;
32+
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
3433

3534
/**
3635
* @author Gary Russell
@@ -39,8 +38,7 @@
3938
* @since 4.0
4039
*
4140
*/
42-
@ContextConfiguration
43-
@RunWith(SpringJUnit4ClassRunner.class)
41+
@SpringJUnitConfig
4442
public class RetryAdviceParserTests {
4543

4644
@Autowired
@@ -64,13 +62,16 @@ public class RetryAdviceParserTests {
6462
@Autowired
6563
private RequestHandlerRetryAdvice a7;
6664

67-
@Autowired @Qualifier("sa1.handler")
65+
@Autowired
66+
@Qualifier("sa1.handler")
6867
private MessageHandler handler1;
6968

70-
@Autowired @Qualifier("sa2.handler")
69+
@Autowired
70+
@Qualifier("sa2.handler")
7171
private MessageHandler handler2;
7272

73-
@Autowired @Qualifier("saDefaultRetry.handler")
73+
@Autowired
74+
@Qualifier("saDefaultRetry.handler")
7475
private MessageHandler defaultRetryHandler;
7576

7677
@Autowired
@@ -86,8 +87,14 @@ public void testAll() {
8687
assertThat(TestUtils.getPropertyValue(a6, "retryTemplate.retryPolicy.maxAttempts")).isEqualTo(8);
8788
assertThat(TestUtils.getPropertyValue(a7, "retryTemplate.retryPolicy.maxAttempts")).isEqualTo(3);
8889

89-
assertThat(TestUtils.getPropertyValue(a3, "retryTemplate.backOffPolicy.backOffPeriod")).isEqualTo(1000L);
90-
assertThat(TestUtils.getPropertyValue(a4, "retryTemplate.backOffPolicy.backOffPeriod")).isEqualTo(1234L);
90+
assertThat(
91+
TestUtils.getPropertyValue(a3, "retryTemplate.backOffPolicy", FixedBackOffPolicy.class)
92+
.getBackOffPeriod())
93+
.isEqualTo(1000L);
94+
assertThat(
95+
TestUtils.getPropertyValue(a4, "retryTemplate.backOffPolicy", FixedBackOffPolicy.class)
96+
.getBackOffPeriod())
97+
.isEqualTo(1234L);
9198

9299
assertThat(TestUtils.getPropertyValue(a5, "retryTemplate.backOffPolicy.initialInterval")).isEqualTo(100L);
93100
assertThat(TestUtils.getPropertyValue(a5, "retryTemplate.backOffPolicy.multiplier")).isEqualTo(2.0);

‎spring-integration-kafka/src/test/java/org/springframework/integration/kafka/dsl/KafkaDslTests.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -128,10 +128,6 @@ public class KafkaDslTests {
128128
@Qualifier("kafkaProducer1.handler")
129129
private KafkaProducerMessageHandler<?, ?> kafkaProducer1;
130130

131-
@Autowired
132-
@Qualifier("kafkaProducer2.handler")
133-
private KafkaProducerMessageHandler<?, ?> kafkaProducer2;
134-
135131
@Autowired
136132
private PollableChannel errorChannel;
137133

@@ -281,7 +277,7 @@ public static class ContextConfiguration {
281277

282278
@Bean
283279
public ConsumerFactory<Integer, String> consumerFactory() {
284-
Map<String, Object> props = KafkaTestUtils.consumerProps(this.embeddedKafkaBrokers, "test1", "false");
280+
Map<String, Object> props = KafkaTestUtils.consumerProps(this.embeddedKafkaBrokers, "dsl-group", "false");
285281
props.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
286282
return new DefaultKafkaConsumerFactory<>(props);
287283
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ void testInboundJson() {
527527

528528
@Test
529529
void testInboundJsonWithPayload() {
530-
Map<String, Object> props = KafkaTestUtils.consumerProps(EMBEDDED_BROKERS, "test6", "true");
530+
Map<String, Object> props = KafkaTestUtils.consumerProps(EMBEDDED_BROKERS, "test7", "true");
531531
props.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
532532
DefaultKafkaConsumerFactory<Integer, Foo> cf = new DefaultKafkaConsumerFactory<>(props);
533533
ContainerProperties containerProps = new ContainerProperties(topic6);

‎spring-integration-kafka/src/test/java/org/springframework/integration/kafka/outbound/KafkaProducerMessageHandlerTests.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@
9494
import org.springframework.kafka.test.EmbeddedKafkaBroker;
9595
import org.springframework.kafka.test.utils.KafkaTestUtils;
9696
import org.springframework.kafka.transaction.KafkaTransactionManager;
97+
import org.springframework.lang.Nullable;
9798
import org.springframework.messaging.Message;
9899
import org.springframework.messaging.MessageHandlingException;
99100
import org.springframework.messaging.MessagingException;
@@ -107,6 +108,8 @@
107108
import org.springframework.transaction.support.DefaultTransactionStatus;
108109
import org.springframework.transaction.support.TransactionTemplate;
109110

111+
import io.micrometer.observation.Observation;
112+
110113
/**
111114
* @author Gary Russell
112115
* @author Biju Kunjummen
@@ -313,7 +316,8 @@ void testOutboundWithAsyncResults() {
313316

314317
@Override
315318
protected CompletableFuture<SendResult<Integer, String>> doSend(
316-
ProducerRecord<Integer, String> producerRecord) {
319+
ProducerRecord<Integer, String> producerRecord,
320+
@Nullable Observation observation) {
317321

318322
CompletableFuture<SendResult<Integer, String>> future = new CompletableFuture<>();
319323
future.completeExceptionally(fooException);

‎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
@@ -210,7 +210,7 @@ class KafkaDslKotlinTests {
210210

211211
@Bean
212212
fun consumerFactory(): ConsumerFactory<Int, String> {
213-
val props = KafkaTestUtils.consumerProps(this.embeddedKafkaBrokers, "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
}
@@ -292,7 +292,7 @@ class KafkaDslKotlinTests {
292292

293293
private fun kafkaMessageHandler(producerFactory: ProducerFactory<Int, String>, topic: String) =
294294
Kafka.outboundChannelAdapter(producerFactory)
295-
.messageKey<Any> { it.headers[IntegrationMessageHeaderAccessor.SEQUENCE_NUMBER] }
295+
.messageKey { it.headers[IntegrationMessageHeaderAccessor.SEQUENCE_NUMBER] }
296296
.headerMapper(mapper())
297297
.sync(true)
298298
.partitionId<Any> { 0 }

0 commit comments

Comments
 (0)