diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-07-01 13:29:25 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-07-01 13:29:25 +0200 |
| commit | e6827ad0a5f5f36d37bb55d573bff749f0967c0d (patch) | |
| tree | c63294550b954c43f0630ccf4105b8e1e592b1b4 | |
| parent | 99b4c31e2be70cdee15409149ce5dd931f785b57 (diff) | |
Remove independent test framework version in base poms
| -rw-r--r-- | cloud-tenant-base/pom.xml | 2 | ||||
| -rw-r--r-- | hosted-tenant-base/pom.xml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cloud-tenant-base/pom.xml b/cloud-tenant-base/pom.xml index 8011d110229..99e2c5badc6 100644 --- a/cloud-tenant-base/pom.xml +++ b/cloud-tenant-base/pom.xml @@ -47,7 +47,7 @@ <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>cloud-tenant-cd</artifactId> - <version>${test-framework.version}</version> + <version>${vespaversion}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/hosted-tenant-base/pom.xml b/hosted-tenant-base/pom.xml index faf8b4295e7..f0d81200ad4 100644 --- a/hosted-tenant-base/pom.xml +++ b/hosted-tenant-base/pom.xml @@ -33,12 +33,12 @@ <properties> <vespaversion>${project.version}</vespaversion> - <test-framework.version>${project.version}</test-framework.version> <target_jdk_version>11</target_jdk_version> <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version> <maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version> <junit.version>5.4.2</junit.version> <test.categories>!integration</test.categories> + <bundlePluginExtraTestProvidedDependencies/> </properties> @@ -86,7 +86,7 @@ <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>tenant-cd-api</artifactId> - <version>${test-framework.version}</version> + <version>${vespaversion}</version> <scope>test</scope> </dependency> |