Skip to content

Commit de839a0

Browse files
ivangsaivangsa
committed
update all e2e tests to use spring-boot 4
1 parent a0334fc commit de839a0

File tree

19 files changed

+152
-110
lines changed

19 files changed

+152
-110
lines changed

‎e2e/src/test/resources/projects/clean-architecture-project/pom.xml‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>3.3.1</version>
8+
<version>4.0.0</version>
99
<relativePath/> <!-- lookup parent from repository -->
1010
</parent>
1111
<groupId>io.zenwave360.example</groupId>
@@ -16,13 +16,13 @@
1616
<properties>
1717
<java.version>17</java.version>
1818
<spring-boot.version>${project.parent.version}</spring-boot.version>
19-
<spring-cloud.version>2022.0.4</spring-cloud.version>
19+
<spring-cloud.version>2025.1.0</spring-cloud.version>
2020

2121
<zenwave.version>2.3.0-SNAPSHOT</zenwave.version>
2222

23-
<jakarta.validation-api.version>3.0.2</jakarta.validation-api.version>
24-
<mapstruct.version>1.5.3.Final</mapstruct.version>
25-
<archunit-junit5.version>1.0.1</archunit-junit5.version>
23+
<jakarta.validation-api.version>3.1.1</jakarta.validation-api.version>
24+
<mapstruct.version>1.6.3</mapstruct.version>
25+
<archunit-junit5.version>1.4.0</archunit-junit5.version>
2626
<spring-cloud-stream-schema.version>2.2.1.RELEASE</spring-cloud-stream-schema.version>
2727
</properties>
2828

@@ -51,6 +51,10 @@
5151
<groupId>org.springframework.boot</groupId>
5252
<artifactId>spring-boot-starter-json</artifactId>
5353
</dependency>
54+
<dependency>
55+
<groupId>org.springframework.boot</groupId>
56+
<artifactId>spring-boot-jackson2</artifactId>
57+
</dependency>
5458
<dependency>
5559
<groupId>org.springframework.boot</groupId>
5660
<artifactId>spring-boot-starter-security</artifactId>
@@ -107,8 +111,8 @@
107111
<scope>test</scope>
108112
</dependency>
109113
<dependency>
110-
<groupId>org.testcontainers</groupId>
111-
<artifactId>junit-jupiter</artifactId>
114+
<groupId>org.springframework.boot</groupId>
115+
<artifactId>spring-boot-testcontainers</artifactId>
112116
<scope>test</scope>
113117
</dependency>
114118
<dependency>
@@ -144,7 +148,7 @@
144148
<plugin>
145149
<groupId>org.openapitools</groupId>
146150
<artifactId>openapi-generator-maven-plugin</artifactId>
147-
<version>7.8.0</version>
151+
<version>7.19.0</version>
148152
<executions>
149153
<execution>
150154
<goals>

‎e2e/src/test/resources/projects/customer-address-postgres-json/pom.xml‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>3.3.1</version>
8+
<version>4.0.0</version>
99
<relativePath/> <!-- lookup parent from repository -->
1010
</parent>
1111
<groupId>io.zenwave360.example</groupId>
@@ -16,13 +16,13 @@
1616
<properties>
1717
<java.version>17</java.version>
1818
<spring-boot.version>${project.parent.version}</spring-boot.version>
19-
<spring-cloud.version>2022.0.4</spring-cloud.version>
19+
<spring-cloud.version>2025.1.0</spring-cloud.version>
2020

2121
<zenwave.version>2.3.0-SNAPSHOT</zenwave.version>
2222

23-
<jakarta.validation-api.version>3.0.2</jakarta.validation-api.version>
24-
<mapstruct.version>1.5.3.Final</mapstruct.version>
25-
<archunit-junit5.version>1.0.1</archunit-junit5.version>
23+
<jakarta.validation-api.version>3.1.1</jakarta.validation-api.version>
24+
<mapstruct.version>1.6.3</mapstruct.version>
25+
<archunit-junit5.version>1.4.0</archunit-junit5.version>
2626
<spring-cloud-stream-schema.version>2.2.1.RELEASE</spring-cloud-stream-schema.version>
2727
</properties>
2828

@@ -51,6 +51,10 @@
5151
<groupId>org.springframework.boot</groupId>
5252
<artifactId>spring-boot-starter-json</artifactId>
5353
</dependency>
54+
<dependency>
55+
<groupId>org.springframework.boot</groupId>
56+
<artifactId>spring-boot-jackson2</artifactId>
57+
</dependency>
5458
<dependency>
5559
<groupId>org.springframework.boot</groupId>
5660
<artifactId>spring-boot-starter-security</artifactId>
@@ -111,8 +115,8 @@
111115
<scope>test</scope>
112116
</dependency>
113117
<dependency>
114-
<groupId>org.testcontainers</groupId>
115-
<artifactId>junit-jupiter</artifactId>
118+
<groupId>org.springframework.boot</groupId>
119+
<artifactId>spring-boot-testcontainers</artifactId>
116120
<scope>test</scope>
117121
</dependency>
118122
<dependency>
@@ -148,7 +152,7 @@
148152
<plugin>
149153
<groupId>org.openapitools</groupId>
150154
<artifactId>openapi-generator-maven-plugin</artifactId>
151-
<version>7.8.0</version>
155+
<version>7.19.0</version>
152156
<executions>
153157
<execution>
154158
<goals>

‎e2e/src/test/resources/projects/customer-address-relational/pom.xml‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>3.3.1</version>
8+
<version>4.0.0</version>
99
<relativePath/> <!-- lookup parent from repository -->
1010
</parent>
1111
<groupId>io.zenwave360.example</groupId>
@@ -16,13 +16,13 @@
1616
<properties>
1717
<java.version>17</java.version>
1818
<spring-boot.version>${project.parent.version}</spring-boot.version>
19-
<spring-cloud.version>2022.0.4</spring-cloud.version>
19+
<spring-cloud.version>2025.1.0</spring-cloud.version>
2020

2121
<zenwave.version>2.3.0-SNAPSHOT</zenwave.version>
2222

23-
<jakarta.validation-api.version>3.0.2</jakarta.validation-api.version>
24-
<mapstruct.version>1.5.3.Final</mapstruct.version>
25-
<archunit-junit5.version>1.0.1</archunit-junit5.version>
23+
<jakarta.validation-api.version>3.1.1</jakarta.validation-api.version>
24+
<mapstruct.version>1.6.3</mapstruct.version>
25+
<archunit-junit5.version>1.4.0</archunit-junit5.version>
2626
<spring-cloud-stream-schema.version>2.2.1.RELEASE</spring-cloud-stream-schema.version>
2727
</properties>
2828

@@ -51,6 +51,10 @@
5151
<groupId>org.springframework.boot</groupId>
5252
<artifactId>spring-boot-starter-json</artifactId>
5353
</dependency>
54+
<dependency>
55+
<groupId>org.springframework.boot</groupId>
56+
<artifactId>spring-boot-jackson2</artifactId>
57+
</dependency>
5458
<dependency>
5559
<groupId>org.springframework.boot</groupId>
5660
<artifactId>spring-boot-starter-security</artifactId>
@@ -107,8 +111,8 @@
107111
<scope>test</scope>
108112
</dependency>
109113
<dependency>
110-
<groupId>org.testcontainers</groupId>
111-
<artifactId>junit-jupiter</artifactId>
114+
<groupId>org.springframework.boot</groupId>
115+
<artifactId>spring-boot-testcontainers</artifactId>
112116
<scope>test</scope>
113117
</dependency>
114118
<dependency>
@@ -144,7 +148,7 @@
144148
<plugin>
145149
<groupId>org.openapitools</groupId>
146150
<artifactId>openapi-generator-maven-plugin</artifactId>
147-
<version>7.8.0</version>
151+
<version>7.19.0</version>
148152
<executions>
149153
<execution>
150154
<goals>

‎e2e/src/test/resources/projects/hexagonal-project/pom.xml‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>3.3.1</version>
8+
<version>4.0.0</version>
99
<relativePath/> <!-- lookup parent from repository -->
1010
</parent>
1111
<groupId>io.zenwave360.example</groupId>
@@ -16,13 +16,13 @@
1616
<properties>
1717
<java.version>17</java.version>
1818
<spring-boot.version>${project.parent.version}</spring-boot.version>
19-
<spring-cloud.version>2022.0.4</spring-cloud.version>
19+
<spring-cloud.version>2025.1.0</spring-cloud.version>
2020

2121
<zenwave.version>2.3.0-SNAPSHOT</zenwave.version>
2222

23-
<jakarta.validation-api.version>3.0.2</jakarta.validation-api.version>
24-
<mapstruct.version>1.5.3.Final</mapstruct.version>
25-
<archunit-junit5.version>1.0.1</archunit-junit5.version>
23+
<jakarta.validation-api.version>3.1.1</jakarta.validation-api.version>
24+
<mapstruct.version>1.6.3</mapstruct.version>
25+
<archunit-junit5.version>1.4.0</archunit-junit5.version>
2626
<spring-cloud-stream-schema.version>2.2.1.RELEASE</spring-cloud-stream-schema.version>
2727
</properties>
2828

@@ -51,6 +51,10 @@
5151
<groupId>org.springframework.boot</groupId>
5252
<artifactId>spring-boot-starter-json</artifactId>
5353
</dependency>
54+
<dependency>
55+
<groupId>org.springframework.boot</groupId>
56+
<artifactId>spring-boot-jackson2</artifactId>
57+
</dependency>
5458
<dependency>
5559
<groupId>org.springframework.boot</groupId>
5660
<artifactId>spring-boot-starter-security</artifactId>
@@ -107,8 +111,8 @@
107111
<scope>test</scope>
108112
</dependency>
109113
<dependency>
110-
<groupId>org.testcontainers</groupId>
111-
<artifactId>junit-jupiter</artifactId>
114+
<groupId>org.springframework.boot</groupId>
115+
<artifactId>spring-boot-testcontainers</artifactId>
112116
<scope>test</scope>
113117
</dependency>
114118
<dependency>
@@ -144,7 +148,7 @@
144148
<plugin>
145149
<groupId>org.openapitools</groupId>
146150
<artifactId>openapi-generator-maven-plugin</artifactId>
147-
<version>7.8.0</version>
151+
<version>7.19.0</version>
148152
<executions>
149153
<execution>
150154
<goals>

‎e2e/src/test/resources/projects/monolith-clinical-project/kotlin-pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.springframework.boot</groupId>
66
<artifactId>spring-boot-starter-parent</artifactId>
7-
<version>3.4.3</version> <!-- lookup parent from repository -->
7+
<version>4.0.0</version> <!-- lookup parent from repository -->
88
</parent>
99

1010
<groupId>com.example.clinical</groupId>
@@ -26,7 +26,7 @@
2626
<asyncApiConsumerApiPackage>${basePackage}.adapters.commands</asyncApiConsumerApiPackage>
2727

2828
<spring-boot.version>${project.parent.version}</spring-boot.version>
29-
<spring-cloud.version>2024.0.0</spring-cloud.version>
29+
<spring-cloud.version>2025.1.0</spring-cloud.version>
3030
<spring-cloud-stream-schema.version>2.2.1.RELEASE</spring-cloud-stream-schema.version>
3131

3232
<zenwave.version>1.7.1</zenwave.version>
@@ -85,7 +85,7 @@
8585
</dependency>
8686
<dependency>
8787
<groupId>org.springframework.boot</groupId>
88-
<artifactId>spring-boot-starter-aop</artifactId>
88+
<artifactId>spring-boot-starter-aspectj</artifactId>
8989
</dependency>
9090
<!-- jpa -->
9191
<dependency>
@@ -151,8 +151,8 @@
151151
<version>${karate.version}</version>
152152
</dependency>
153153
<dependency>
154-
<groupId>org.testcontainers</groupId>
155-
<artifactId>junit-jupiter</artifactId>
154+
<groupId>org.springframework.boot</groupId>
155+
<artifactId>spring-boot-testcontainers</artifactId>
156156
<scope>test</scope>
157157
</dependency>
158158
<dependency>
@@ -332,7 +332,7 @@
332332
<plugin>
333333
<groupId>org.openapitools</groupId>
334334
<artifactId>openapi-generator-maven-plugin</artifactId>
335-
<version>7.11.0</version>
335+
<version>7.19.0</version>
336336
<configuration>
337337
<skipIfSpecIsUnchanged>true</skipIfSpecIsUnchanged>
338338
<generatorName>kotlin-spring</generatorName>

‎e2e/src/test/resources/projects/monolith-clinical-project/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.springframework.boot</groupId>
66
<artifactId>spring-boot-starter-parent</artifactId>
7-
<version>3.4.3</version> <!-- lookup parent from repository -->
7+
<version>4.0.0</version> <!-- lookup parent from repository -->
88
</parent>
99

1010
<groupId>com.example.clinical</groupId>
@@ -25,7 +25,7 @@
2525
<asyncApiConsumerApiPackage>${basePackage}.adapters.commands</asyncApiConsumerApiPackage>
2626

2727
<spring-boot.version>${project.parent.version}</spring-boot.version>
28-
<spring-cloud.version>2024.0.0</spring-cloud.version>
28+
<spring-cloud.version>2025.1.0</spring-cloud.version>
2929
<spring-cloud-stream-schema.version>2.2.1.RELEASE</spring-cloud-stream-schema.version>
3030

3131
<zenwave.version>1.7.1</zenwave.version>
@@ -69,7 +69,7 @@
6969
</dependency>
7070
<dependency>
7171
<groupId>org.springframework.boot</groupId>
72-
<artifactId>spring-boot-starter-aop</artifactId>
72+
<artifactId>spring-boot-starter-aspectj</artifactId>
7373
</dependency>
7474
<!-- jpa -->
7575
<dependency>
@@ -140,8 +140,8 @@
140140
<version>${karate.version}</version>
141141
</dependency>
142142
<dependency>
143-
<groupId>org.testcontainers</groupId>
144-
<artifactId>junit-jupiter</artifactId>
143+
<groupId>org.springframework.boot</groupId>
144+
<artifactId>spring-boot-testcontainers</artifactId>
145145
<scope>test</scope>
146146
</dependency>
147147
<dependency>
@@ -270,7 +270,7 @@
270270
<plugin>
271271
<groupId>org.openapitools</groupId>
272272
<artifactId>openapi-generator-maven-plugin</artifactId>
273-
<version>7.11.0</version>
273+
<version>7.19.0</version>
274274
<configuration>
275275
<skipIfSpecIsUnchanged>true</skipIfSpecIsUnchanged>
276276
<generatorName>spring</generatorName>

‎e2e/src/test/resources/projects/monolith-clinical-project/src/main/java/com/example/clinical/config/DatabaseConfiguration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.example.clinical.config;
22

3-
import org.springframework.boot.autoconfigure.domain.EntityScan;
3+
import org.springframework.boot.persistence.autoconfigure.EntityScan;
44
import org.springframework.context.annotation.Configuration;
55
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
66
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;

‎e2e/src/test/resources/projects/online-food-delivery-mongo/modules/orders/pom.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
<plugin>
113113
<groupId>org.openapitools</groupId>
114114
<artifactId>openapi-generator-maven-plugin</artifactId>
115-
<version>6.6.0</version>
115+
<version>7.19.0</version>
116116
<executions>
117117
<execution>
118118
<id>openapi-generator-client-customers</id>
@@ -135,6 +135,7 @@
135135
<openApiNullable>false</openApiNullable>
136136
<useOptional>false</useOptional>
137137
<useTags>true</useTags>
138+
<interfaceOnly>true</interfaceOnly>
138139
</configOptions>
139140
</configuration>
140141
</execution>
@@ -160,6 +161,7 @@
160161
<openApiNullable>false</openApiNullable>
161162
<useOptional>false</useOptional>
162163
<useTags>true</useTags>
164+
<interfaceOnly>true</interfaceOnly>
163165
</configOptions>
164166
</configuration>
165167
</execution>

‎e2e/src/test/resources/projects/online-food-delivery-mongo/modulith/src/main/java/io/zenwave360/example/config/MongoConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.zenwave360.example.config;
22

3-
import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
3+
import org.springframework.boot.mongodb.autoconfigure.MongoAutoConfiguration;
44
import org.springframework.context.annotation.Bean;
55
import org.springframework.context.annotation.Configuration;
66
import org.springframework.context.annotation.Import;

0 commit comments

Comments
 (0)