aboutsummaryrefslogtreecommitdiffstats
path: root/tenant-base
diff options
context:
space:
mode:
authorJon Marius Venstad <jvenstad@yahoo-inc.com>2019-06-21 09:24:24 +0200
committerJon Marius Venstad <jvenstad@yahoo-inc.com>2019-06-21 09:24:24 +0200
commit3effbee290b0436c4b4924fd914a1dd2f6834071 (patch)
tree9b30729f1e60e13e2db10f142cda76c7e160ad34 /tenant-base
parentafaffc09630eaeb475ddf7c5a55f90656c33213c (diff)
Make test_framework_version the same as vespaversion again
Diffstat (limited to 'tenant-base')
-rw-r--r--tenant-base/pom.xml13
1 files changed, 6 insertions, 7 deletions
diff --git a/tenant-base/pom.xml b/tenant-base/pom.xml
index 3c48d22085e..b829089465f 100644
--- a/tenant-base/pom.xml
+++ b/tenant-base/pom.xml
@@ -33,7 +33,6 @@
<properties>
<vespaversion>${project.version}</vespaversion>
- <test_framework_version>${vespaversion}</test_framework_version>
<target_jdk_version>11</target_jdk_version>
<compiler_plugin_version>3.8.0</compiler_plugin_version>
<surefire_version>2.22.0</surefire_version> <!-- NOTE bjorncs 15.06.2017: Version 2.20 has OoM issues -->
@@ -55,21 +54,21 @@
<dependencies>
<dependency>
<groupId>com.yahoo.vespa</groupId>
- <artifactId>tenant-cd</artifactId>
- <version>${test_framework_version}</version>
- <scope>test</scope>
+ <artifactId>container</artifactId>
+ <version>${vespaversion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.yahoo.vespa</groupId>
- <artifactId>container</artifactId>
+ <artifactId>container-test</artifactId>
<version>${vespaversion}</version>
- <scope>provided</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>com.yahoo.vespa</groupId>
- <artifactId>container-test</artifactId>
+ <artifactId>tenant-cd</artifactId>
<version>${vespaversion}</version>
<scope>test</scope>
</dependency>