Skip to content

Commit c4d19e4

Browse files
authored
PHOENIX-7780: Update jUnit to 5.10 in pom.xml files (#188)
1 parent 7a681d5 commit c4d19e4

5 files changed

Lines changed: 22 additions & 11 deletions

File tree

phoenix-queryserver-it/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@
124124
<scope>test</scope>
125125
</dependency>
126126
<dependency>
127-
<groupId>junit</groupId>
128-
<artifactId>junit</artifactId>
127+
<groupId>org.junit.vintage</groupId>
128+
<artifactId>junit-vintage-engine</artifactId>
129129
<scope>test</scope>
130130
</dependency>
131131
<dependency>

phoenix-queryserver-load-balancer/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@
127127

128128
<!-- for tests -->
129129
<dependency>
130-
<groupId>junit</groupId>
131-
<artifactId>junit</artifactId>
130+
<groupId>org.junit.vintage</groupId>
131+
<artifactId>junit-vintage-engine</artifactId>
132132
<scope>test</scope>
133133
</dependency>
134134
<dependency>

phoenix-queryserver-orchestrator/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@
9696
</dependency>
9797
<!-- test -->
9898
<dependency>
99-
<groupId>junit</groupId>
100-
<artifactId>junit</artifactId>
99+
<groupId>org.junit.vintage</groupId>
100+
<artifactId>junit-vintage-engine</artifactId>
101101
<scope>test</scope>
102102
</dependency>
103103
<dependency>

phoenix-queryserver/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,8 @@
232232
<scope>test</scope>
233233
</dependency>
234234
<dependency>
235-
<groupId>junit</groupId>
236-
<artifactId>junit</artifactId>
235+
<groupId>org.junit.vintage</groupId>
236+
<artifactId>junit-vintage-engine</artifactId>
237237
<scope>test</scope>
238238
</dependency>
239239
<dependency>

pom.xml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
<!-- Test Dependency versions -->
9696
<testng.version>6.10</testng.version>
9797
<mockito.version>4.11.0</mockito.version>
98-
<junit.version>4.13.2</junit.version>
98+
<junit.version>5.10.2</junit.version>
9999

100100
<!-- Plugin versions -->
101101
<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
@@ -217,6 +217,12 @@
217217
</plugin>
218218
<plugin>
219219
<artifactId>maven-dependency-plugin</artifactId>
220+
<configuration>
221+
<ignoredDependencies>
222+
<ignoredDependency>junit:junit:jar:4.13.2</ignoredDependency>
223+
<ignoredDependency>org.junit.vintage:junit-vintage-engine:jar:5.10.2</ignoredDependency>
224+
</ignoredDependencies>
225+
</configuration>
220226
<executions>
221227
<execution>
222228
<id>enforce-dependencies</id>
@@ -1207,11 +1213,16 @@
12071213
<scope>test</scope>
12081214
</dependency>
12091215
<dependency>
1210-
<groupId>junit</groupId>
1211-
<artifactId>junit</artifactId>
1216+
<groupId>org.junit.jupiter</groupId>
1217+
<artifactId>junit-jupiter-engine</artifactId>
12121218
<version>${junit.version}</version>
12131219
<scope>test</scope>
12141220
</dependency>
1221+
<dependency>
1222+
<groupId>org.junit.vintage</groupId>
1223+
<artifactId>junit-vintage-engine</artifactId>
1224+
<version>${junit.version}</version>
1225+
</dependency>
12151226
<dependency>
12161227
<groupId>org.mockito</groupId>
12171228
<artifactId>mockito-bom</artifactId>

0 commit comments

Comments
 (0)