summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Marius Venstad <jonmv@users.noreply.github.com>2020-01-15 08:28:33 +0100
committerGitHub <noreply@github.com>2020-01-15 08:28:33 +0100
commita9d36eec1a46ab8089ae77ecae52b25970a58e56 (patch)
tree8436ae4a6a93ed9839063df21d28970b87222a79
parent08a269e03a9b4785422ff66d75a9395853279db3 (diff)
parentd51a4e273f5e1df1f798ad5c55baa721744070aa (diff)
Merge pull request #11779 from vespa-engine/jvenstad/decouple-systemtest-framework-and-vespa-versions-again
Decouple test-framework.version from vespaversion for tenant-cd
-rw-r--r--tenant-base/pom.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/tenant-base/pom.xml b/tenant-base/pom.xml
index 6488a681c95..22e1bb0e9ca 100644
--- a/tenant-base/pom.xml
+++ b/tenant-base/pom.xml
@@ -33,6 +33,7 @@
<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>
@@ -93,7 +94,7 @@
<dependency>
<groupId>com.yahoo.vespa</groupId>
<artifactId>tenant-cd</artifactId>
- <version>${vespaversion}</version>
+ <version>${test-framework.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>