diff options
| author | jonmv <venstad@gmail.com> | 2022-06-17 10:25:57 +0200 |
|---|---|---|
| committer | jonmv <venstad@gmail.com> | 2022-06-17 10:25:57 +0200 |
| commit | 6805a4b1ad08a32676e51e15e0a72ff468ff2f36 (patch) | |
| tree | 501254e9e7dc10ddaa97e8e47a1019be9977e515 /hosted-tenant-base | |
| parent | a90639a4c194cbf486d20eba8969340a4ce461ad (diff) | |
Rename junit.versino --> vespa.junit.version to avoid users overriding it
Diffstat (limited to 'hosted-tenant-base')
| -rw-r--r-- | hosted-tenant-base/pom.xml | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/hosted-tenant-base/pom.xml b/hosted-tenant-base/pom.xml index 39b555ea105..ca33bf6a6ac 100644 --- a/hosted-tenant-base/pom.xml +++ b/hosted-tenant-base/pom.xml @@ -36,7 +36,8 @@ <target_jdk_version>17</target_jdk_version> <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version> <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version> - <junit.version>5.8.1</junit.version> <!-- NOTE: this must be in sync with junit version specified in 'tenant-cd-api' --> + <!-- NOTE: this must not be overriden by users, and must be in sync with junit version specified in 'tenant-cd-api' --> + <vespa.junit.version>5.8.1</junit.version> <test.categories>!integration</test.categories> <!-- To allow specialized base pom to include additional "test provided" dependencies --> @@ -94,13 +95,13 @@ <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-engine</artifactId> - <version>${junit.version}</version> + <version>${vespa.junit.version}</version> </dependency> <dependency> <groupId>org.junit.vintage</groupId> <artifactId>junit-vintage-engine</artifactId> - <version>${junit.version}</version> + <version>${vespa.junit.version}</version> </dependency> </dependencies> </dependencyManagement> @@ -235,8 +236,8 @@ <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.version}):jar:*</exclude> - <exclude>org.junit.jupiter:junit-jupiter-api:(${junit.version},):jar:*</exclude> + <exclude>org.junit.jupiter:junit-jupiter-api:(,${vespa.junit.version}):jar:*</exclude> + <exclude>org.junit.jupiter:junit-jupiter-api:(${vespa.junit.version},):jar:*</exclude> </excludes> </bannedDependencies> </rules> |