summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorn.christian@seime.no>2023-09-12 14:10:41 +0200
committerGitHub <noreply@github.com>2023-09-12 14:10:41 +0200
commit0a93d81af746a81616cdb7a083379d8aabd3bfa8 (patch)
treeb700e53030c5a8d0ba4e987b3de1f99e1f761c66
parentf18611e5acad7257ef49939ea2e9ba7179c6ea33 (diff)
parent1c638a363d10ad76740df202510510884eccf0d2 (diff)
Merge pull request #28495 from vespa-engine/bjorncs/junit
Bjorncs/junit
-rw-r--r--hosted-tenant-base/pom.xml28
1 files changed, 27 insertions, 1 deletions
diff --git a/hosted-tenant-base/pom.xml b/hosted-tenant-base/pom.xml
index 33f47cf262f..1322f0e2ee0 100644
--- a/hosted-tenant-base/pom.xml
+++ b/hosted-tenant-base/pom.xml
@@ -117,6 +117,24 @@
<version>${junit.vespa.tenant.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-params</artifactId>
+ <version>${junit.vespa.tenant.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.junit.platform</groupId>
+ <artifactId>junit-platform-engine</artifactId>
+ <version>${junit.platform.vespa.tenant.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.junit.platform</groupId>
+ <artifactId>junit-platform-commons</artifactId>
+ <version>${junit.platform.vespa.tenant.version}</version>
+ </dependency>
+
<!-- Transitive dependency of junit4 -->
<dependency>
<groupId>org.hamcrest</groupId>
@@ -251,13 +269,21 @@
<configuration>
<rules>
<bannedDependencies>
- <!-- Fail validation for apps with junit-jupiter-api in compile scope, or on wrong version. -->
<excludes>
+ <!-- Fail validation for apps with junit-jupiter-api in compile scope, or on wrong version. -->
<exclude>org.junit.jupiter:junit-jupiter-api:*:jar:compile</exclude>
<exclude>org.junit.jupiter:junit-jupiter-api:*:jar:provided</exclude>
<exclude>org.junit.jupiter:junit-jupiter-api:*:jar:runtime</exclude>
<exclude>org.junit.jupiter:junit-jupiter-api:(,${junit.vespa.tenant.version}):jar:*</exclude>
<exclude>org.junit.jupiter:junit-jupiter-api:(${junit.vespa.tenant.version},):jar:*</exclude>
+
+ <!-- Fail validation of junit artifacts on wrong version. -->
+ <exclude>org.junit.jupiter:junit-jupiter-params:(,${junit.vespa.tenant.version}):jar:*</exclude>
+ <exclude>org.junit.jupiter:junit-jupiter-params:(${junit.vespa.tenant.version},):jar:*</exclude>
+ <exclude>org.junit.platform:junit-platform-engine:(,${junit.platform.vespa.tenant.version}):jar:*</exclude>
+ <exclude>org.junit.platform:junit-platform-engine:(${junit.platform.vespa.tenant.version},):jar:*</exclude>
+ <exclude>org.junit.platform:junit-platform-commons:(,${junit.platform.vespa.tenant.version}):jar:*</exclude>
+ <exclude>org.junit.platform:junit-platform-commons:(${junit.platform.vespa.tenant.version},):jar:*</exclude>
</excludes>
</bannedDependencies>
</rules>