Skip to content

Commit cd339cd

Browse files
test: fix test-compile fails when the version of the spring-boot is lower than 2.4.0 (#5186)
1 parent c866966 commit cd339cd

File tree

3 files changed

+22
-44
lines changed

3 files changed

+22
-44
lines changed

build/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,10 @@
7676
<spring-boot.version>2.5.13</spring-boot.version>
7777
<spring-framework.version>5.3.19</spring-framework.version>
7878

79+
<!-- For test -->
80+
<junit-jupiter.version>5.8.2</junit-jupiter.version>
81+
<junit-platform.version>1.8.2</junit-platform.version>
82+
7983
<!-- Maven plugin versions -->
8084
<!-- Build -->
8185
<easyj-maven-plugin.version>1.0.5</easyj-maven-plugin.version>

dependencies/pom.xml

Lines changed: 9 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -110,15 +110,22 @@
110110
<kotlin-coroutines.version>1.4.3</kotlin-coroutines.version>
111111

112112
<!-- # for test -->
113-
<junit-jupiter.version>5.8.2</junit-jupiter.version>
114-
<junit-platform.version>1.8.2</junit-platform.version>
115113
<mockito.version>2.23.4</mockito.version>
116114
<assertj-core.version>3.12.2</assertj-core.version>
117115
<jetty-version>9.4.38.v20210224</jetty-version>
118116
</properties>
119117

120118
<dependencyManagement>
121119
<dependencies>
120+
<!-- junit5 -->
121+
<dependency>
122+
<groupId>org.junit</groupId>
123+
<artifactId>junit-bom</artifactId>
124+
<version>${junit-jupiter.version}</version>
125+
<type>pom</type>
126+
<scope>import</scope>
127+
</dependency>
128+
122129
<!-- spring-framework CVE-2022-22965-->
123130
<dependency>
124131
<groupId>org.springframework</groupId>
@@ -638,48 +645,6 @@
638645

639646

640647
<!-- test -->
641-
<dependency>
642-
<groupId>org.junit</groupId>
643-
<artifactId>junit-bom</artifactId>
644-
<version>${junit-jupiter.version}</version>
645-
<type>pom</type>
646-
<scope>import</scope>
647-
</dependency>
648-
<dependency>
649-
<groupId>org.junit.jupiter</groupId>
650-
<artifactId>junit-jupiter</artifactId>
651-
<version>${junit-jupiter.version}</version>
652-
</dependency>
653-
<dependency>
654-
<groupId>org.junit.jupiter</groupId>
655-
<artifactId>junit-jupiter-api</artifactId>
656-
<version>${junit-jupiter.version}</version>
657-
</dependency>
658-
<dependency>
659-
<groupId>org.junit.jupiter</groupId>
660-
<artifactId>junit-jupiter-engine</artifactId>
661-
<version>${junit-jupiter.version}</version>
662-
</dependency>
663-
<dependency>
664-
<groupId>org.junit.jupiter</groupId>
665-
<artifactId>junit-jupiter-params</artifactId>
666-
<version>${junit-jupiter.version}</version>
667-
</dependency>
668-
<dependency>
669-
<groupId>org.junit.platform</groupId>
670-
<artifactId>junit-platform-commons</artifactId>
671-
<version>${junit-platform.version}</version>
672-
</dependency>
673-
<dependency>
674-
<groupId>org.junit.platform</groupId>
675-
<artifactId>junit-platform-engine</artifactId>
676-
<version>${junit-platform.version}</version>
677-
</dependency>
678-
<dependency>
679-
<groupId>org.junit.platform</groupId>
680-
<artifactId>junit-platform-launcher</artifactId>
681-
<version>${junit-platform.version}</version>
682-
</dependency>
683648
<dependency>
684649
<groupId>org.mockito</groupId>
685650
<artifactId>mockito-core</artifactId>

server/pom.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,15 @@
3535

3636
<dependencyManagement>
3737
<dependencies>
38+
<!-- junit5 -->
39+
<dependency>
40+
<groupId>org.junit</groupId>
41+
<artifactId>junit-bom</artifactId>
42+
<version>${junit-jupiter.version}</version>
43+
<type>pom</type>
44+
<scope>import</scope>
45+
</dependency>
46+
3847
<!-- spring-framework-->
3948
<dependency>
4049
<groupId>org.springframework</groupId>

0 commit comments

Comments
 (0)