diff options
| author | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2023-08-31 15:39:01 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2023-08-31 15:39:01 +0200 |
| commit | 6dddd9c5618a8463b405d5f52cf692990d8b3106 (patch) | |
| tree | ce96d608ba71d8001fab93558a1c6dcee9b1edc6 | |
| parent | 4969371b0b09a50d601637f8fb27b2f7894b690c (diff) | |
Consolidate versions
| -rw-r--r-- | hosted-tenant-base/pom.xml | 2 | ||||
| -rw-r--r-- | parent/pom.xml | 5 | ||||
| -rw-r--r-- | tenant-cd-api/pom.xml | 4 | ||||
| -rw-r--r-- | vespa-osgi-testrunner/pom.xml | 2 |
4 files changed, 8 insertions, 5 deletions
diff --git a/hosted-tenant-base/pom.xml b/hosted-tenant-base/pom.xml index 5b63b6e883a..6f21ed3aafc 100644 --- a/hosted-tenant-base/pom.xml +++ b/hosted-tenant-base/pom.xml @@ -44,7 +44,7 @@ <target_jdk_version>17</target_jdk_version> <!-- NOTE: this must not be overriden by users, and must be in sync with junit version specified in 'tenant-cd-api' --> - <junit.vespa.tenant.version>5.10.0</junit.vespa.tenant.version> + <junit.vespa.tenant.version>${junit.vespa.version}</junit.vespa.tenant.version> <test.categories>!integration</test.categories> <!-- To allow specialized base pom to include additional "test provided" dependencies --> diff --git a/parent/pom.xml b/parent/pom.xml index f60a4fea530..0603ade1694 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1037,6 +1037,11 @@ <version>${junit.vespa.version}</version> </dependency> <dependency> + <groupId>org.junit.platform</groupId> + <artifactId>junit-platform-launcher</artifactId> + <version>${junit.platform.vespa.version}</version> + </dependency> + <dependency> <groupId>org.junit.vintage</groupId> <artifactId>junit-vintage-engine</artifactId> <version>${junit.vespa.version}</version> diff --git a/tenant-cd-api/pom.xml b/tenant-cd-api/pom.xml index 5377c1b7b5b..42e3fe150fa 100644 --- a/tenant-cd-api/pom.xml +++ b/tenant-cd-api/pom.xml @@ -24,7 +24,7 @@ This version must match the string in all ExportPackage annotations in this module. It must also be in sync junit version specified in 'hosted-tenant-base'. --> - <hosted-tenant-base-junit-version>5.10.0</hosted-tenant-base-junit-version> + <hosted-tenant-base-junit-version>${junit.vespa.version}</hosted-tenant-base-junit-version> </properties> @@ -69,7 +69,7 @@ <dependency> <groupId>org.junit.platform</groupId> <artifactId>junit-platform-commons</artifactId> - <version>1.10.0</version> + <version>${junit.platform.vespa.version}</version> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> diff --git a/vespa-osgi-testrunner/pom.xml b/vespa-osgi-testrunner/pom.xml index d9314b60893..17d9beb294e 100644 --- a/vespa-osgi-testrunner/pom.xml +++ b/vespa-osgi-testrunner/pom.xml @@ -43,7 +43,6 @@ <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-engine</artifactId> - <version>5.10.0</version> <exclusions> <exclusion> <groupId>org.junit.jupiter</groupId> @@ -66,7 +65,6 @@ <dependency> <groupId>org.junit.platform</groupId> <artifactId>junit-platform-launcher</artifactId> - <version>1.10.0</version> <exclusions> <exclusion> <groupId>org.junit.jupiter</groupId> |