Upgrade SpringBoot version

Add property to tests with embedded kafka (see spring-cloud/spring-cloud-stream-binder-kafka#1079 )
akutschera · May 4, 2022 · b954b0b · b954b0b
1 parent 335d577
commit b954b0b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/spring-cloud-messaging/pom.xml b/spring-cloud-messaging/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.5</version>
+		<version>2.6.7</version>
 	</parent>
 	<groupId>com.github.akutschera</groupId>
 	<artifactId>spring-cloud-messaging</artifactId>
@@ -15,7 +15,7 @@
 
 	<properties>
 		<java.version>11</java.version>
-		<spring-cloud.version>2020.0.2</spring-cloud.version>
+		<spring-cloud.version>2021.0.1</spring-cloud.version>
 	</properties>
 
 	<dependencies>
@@ -39,12 +39,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>org.junit.vintage</groupId>
-					<artifactId>junit-vintage-engine</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>

diff --git a/...ava/com/github/akutschera/howdoitestthis/functions/springcloudmessaging/AllBeansTest.java b/...ava/com/github/akutschera/howdoitestthis/functions/springcloudmessaging/AllBeansTest.java
@@ -77,7 +77,7 @@ void testConsumer() {
     void testFunction() throws IOException {
         inputDestination.send( MessageBuilder.withPayload( "{ \"name\": \"foo\" }" ).build(), "throughput-topic" );
 
-        var payload = outputDestination.receive().getPayload();
+        var payload = outputDestination.receive(1_000L, "conversion-output-topic").getPayload();
 
         var address = new ObjectMapper().readValue( payload, Address.class );
 

diff --git a/...om/github/akutschera/howdoitestthis/functions/springcloudmessaging/EmbeddedKafkaTest.java b/...om/github/akutschera/howdoitestthis/functions/springcloudmessaging/EmbeddedKafkaTest.java
@@ -26,7 +26,8 @@
  * Created by Andreas Kutschera.
  */
 @SpringBootTest(properties = {
-        "spring.kafka.bootstrap-servers=${spring.embedded.kafka.brokers}"
+        "spring.kafka.bootstrap-servers=${spring.embedded.kafka.brokers}",
+        "spring.cloud.stream.kafka.bindings.convertPersonToAddress-in-0.consumer.ack-mode=BATCH"
 })
 @EmbeddedKafka(topics = { "person-in", "address-out" })
 @ActiveProfiles("kafka")

diff --git a/...ub/akutschera/howdoitestthis/functions/springcloudmessaging/EmbeddedKafkaWithDlqTest.java b/...ub/akutschera/howdoitestthis/functions/springcloudmessaging/EmbeddedKafkaWithDlqTest.java
@@ -23,7 +23,8 @@
  * Created by Andreas Kutschera.
  */
 @SpringBootTest(properties = {
-        "spring.kafka.bootstrap-servers=${spring.embedded.kafka.brokers}"
+        "spring.kafka.bootstrap-servers=${spring.embedded.kafka.brokers}",
+        "spring.cloud.stream.kafka.bindings.convertPersonToAddress-in-0.consumer.ack-mode=BATCH"
 })
 @EmbeddedKafka(topics = { "person-in", "dead-out", "address-out" })
 @ActiveProfiles("kafka-with-dlq")