Skip to content

Commit 1a18922

Browse files
dizzzzdizzzz
authored
Merge pull request #4161 from evolvedbinary/build/use-junit-jupiter
Run JUnit 4 tests via JUnit 5
2 parents d52c1ad + 55391e5 commit 1a18922

File tree

21 files changed

+67
-41
lines changed

21 files changed

+67
-41
lines changed

‎exist-ant/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@
7575
</dependency>
7676

7777
<dependency>
78-
<groupId>org.junit.jupiter</groupId>
79-
<artifactId>junit-jupiter-api</artifactId>
78+
<groupId>org.junit.vintage</groupId>
79+
<artifactId>junit-vintage-engine</artifactId>
8080
<scope>test</scope>
8181
</dependency>
8282
<dependency>

‎exist-core/pom.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -484,6 +484,11 @@
484484
<artifactId>junit-jupiter-api</artifactId>
485485
<scope>test</scope>
486486
</dependency>
487+
<dependency>
488+
<groupId>org.junit.vintage</groupId>
489+
<artifactId>junit-vintage-engine</artifactId>
490+
<scope>test</scope>
491+
</dependency>
487492
<dependency>
488493
<groupId>org.junit.jupiter</groupId>
489494
<artifactId>junit-jupiter-params</artifactId>
@@ -905,6 +910,8 @@ The BaseX Team. The original license statement is also included below.]]></pream
905910
<ignoredUnusedDeclaredDependency>org.eclipse.jetty:jetty-deploy:jar:${jetty.version}</ignoredUnusedDeclaredDependency>
906911
<ignoredUnusedDeclaredDependency>org.eclipse.jetty:jetty-jmx:jar:${jetty.version}</ignoredUnusedDeclaredDependency>
907912
<ignoredUnusedDeclaredDependency>${project.groupId}:exist-jetty-config:jar:${project.version}</ignoredUnusedDeclaredDependency>
913+
914+
<ignoredUnusedDeclaredDependency>org.junit.vintage:junit-vintage-engine:jar:${junit.vintage.version}</ignoredUnusedDeclaredDependency>
908915
</ignoredUnusedDeclaredDependencies>
909916
</configuration>
910917
</execution>

‎exist-parent/pom.xml‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -476,6 +476,18 @@
476476
<version>${junit.jupiter.version}</version>
477477
<scope>test</scope>
478478
</dependency>
479+
<dependency>
480+
<groupId>org.junit.jupiter</groupId>
481+
<artifactId>junit-jupiter-engine</artifactId>
482+
<version>${junit.jupiter.version}</version>
483+
<scope>test</scope>
484+
</dependency>
485+
<dependency>
486+
<groupId>org.junit.vintage</groupId>
487+
<artifactId>junit-vintage-engine</artifactId>
488+
<version>${junit.vintage.version}</version>
489+
<scope>test</scope>
490+
</dependency>
479491
<dependency>
480492
<groupId>junit</groupId>
481493
<artifactId>junit</artifactId>
@@ -929,9 +941,9 @@
929941
</goals>
930942
<configuration>
931943
<failOnWarning>true</failOnWarning>
932-
<ignoredDependencies>
933-
<ignoredDependency>org.junit.jupiter:junit-jupiter-api</ignoredDependency>
934-
</ignoredDependencies>
944+
<ignoredUnusedDeclaredDependencies>
945+
<ignoredUnusedDeclaredDependency>org.junit.vintage:junit-vintage-engine:jar:${junit.vintage.version}</ignoredUnusedDeclaredDependency>
946+
</ignoredUnusedDeclaredDependencies>
935947
</configuration>
936948
</execution>
937949
</executions>

‎extensions/contentextraction/pom.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@
8686
</dependency>
8787

8888
<dependency>
89-
<groupId>org.junit.jupiter</groupId>
90-
<artifactId>junit-jupiter-api</artifactId>
89+
<groupId>org.junit.vintage</groupId>
90+
<artifactId>junit-vintage-engine</artifactId>
9191
<scope>test</scope>
9292
</dependency>
9393

@@ -132,6 +132,7 @@
132132
<failOnWarning>true</failOnWarning>
133133
<ignoredUnusedDeclaredDependencies>
134134
<ignoredUnusedDeclaredDependency>org.apache.tika:tika-parsers</ignoredUnusedDeclaredDependency>
135+
<ignoredUnusedDeclaredDependency>org.junit.vintage:junit-vintage-engine:jar:${junit.vintage.version}</ignoredUnusedDeclaredDependency>
135136
</ignoredUnusedDeclaredDependencies>
136137
</configuration>
137138
</execution>

‎extensions/expath/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@
9191
</dependency>
9292

9393
<dependency>
94-
<groupId>org.junit.jupiter</groupId>
95-
<artifactId>junit-jupiter-api</artifactId>
94+
<groupId>org.junit.vintage</groupId>
95+
<artifactId>junit-vintage-engine</artifactId>
9696
<scope>test</scope>
9797
</dependency>
9898

‎extensions/exquery/restxq/pom.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,8 @@
164164
<!-- test dependencies -->
165165

166166
<dependency>
167-
<groupId>org.junit.jupiter</groupId>
168-
<artifactId>junit-jupiter-api</artifactId>
167+
<groupId>org.junit.vintage</groupId>
168+
<artifactId>junit-vintage-engine</artifactId>
169169
<scope>test</scope>
170170
</dependency>
171171
<dependency>
@@ -246,6 +246,7 @@
246246
<failOnWarning>true</failOnWarning>
247247
<ignoredUnusedDeclaredDependencies>
248248
<ignoredUnusedDeclaredDependency>${project.groupId}:exist-expath:jar:${project.version}</ignoredUnusedDeclaredDependency> <!-- needed for XQSuite tests that depend on EXPath HTTP client -->
249+
<ignoredUnusedDeclaredDependency>org.junit.vintage:junit-vintage-engine:jar:${junit.vintage.version}</ignoredUnusedDeclaredDependency>
249250
</ignoredUnusedDeclaredDependencies>
250251
</configuration>
251252
</execution>

‎extensions/indexes/lucene/pom.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@
130130
</dependency>
131131

132132
<dependency>
133-
<groupId>org.junit.jupiter</groupId>
134-
<artifactId>junit-jupiter-api</artifactId>
133+
<groupId>org.junit.vintage</groupId>
134+
<artifactId>junit-vintage-engine</artifactId>
135135
<scope>test</scope>
136136
</dependency>
137137

@@ -189,6 +189,7 @@
189189
<failOnWarning>true</failOnWarning>
190190
<ignoredUnusedDeclaredDependencies>
191191
<ignoredUnusedDeclaredDependency>org.apache.lucene:lucene-queries:jar:${lucene.version}</ignoredUnusedDeclaredDependency> <!-- needed at runtime to support lucene query syntax -->
192+
<ignoredUnusedDeclaredDependency>org.junit.vintage:junit-vintage-engine:jar:${junit.vintage.version}</ignoredUnusedDeclaredDependency>
192193
</ignoredUnusedDeclaredDependencies>
193194
</configuration>
194195
</execution>

‎extensions/indexes/ngram/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@
6363
</dependency>
6464

6565
<dependency>
66-
<groupId>org.junit.jupiter</groupId>
67-
<artifactId>junit-jupiter-api</artifactId>
66+
<groupId>org.junit.vintage</groupId>
67+
<artifactId>junit-vintage-engine</artifactId>
6868
<scope>test</scope>
6969
</dependency>
7070

‎extensions/indexes/range/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@
9797
</dependency>
9898

9999
<dependency>
100-
<groupId>org.junit.jupiter</groupId>
101-
<artifactId>junit-jupiter-api</artifactId>
100+
<groupId>org.junit.vintage</groupId>
101+
<artifactId>junit-vintage-engine</artifactId>
102102
<scope>test</scope>
103103
</dependency>
104104

‎extensions/indexes/sort/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@
6363
</dependency>
6464

6565
<dependency>
66-
<groupId>org.junit.jupiter</groupId>
67-
<artifactId>junit-jupiter-api</artifactId>
66+
<groupId>org.junit.vintage</groupId>
67+
<artifactId>junit-vintage-engine</artifactId>
6868
<scope>test</scope>
6969
</dependency>
7070

0 commit comments

Comments
 (0)