aboutsummaryrefslogtreecommitdiffstats
path: root/cloud-tenant-base
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2020-07-01 15:01:51 +0200
committerGitHub <noreply@github.com>2020-07-01 15:01:51 +0200
commitae0f04876dcafcfb754deb9a007f91ce4ce52646 (patch)
treedf58ad8f559317c513d1dfc11d77acf2201a5a51 /cloud-tenant-base
parentb6bc5ce6319b1fe73c181bcf2b25a28a64bb9701 (diff)
parentbada9c366b37ad7db963afbe91c5b333cd31fbfb (diff)
Merge pull request #13770 from vespa-engine/bjorncs/hosted-tenant-base
Bjorncs/hosted tenant base
Diffstat (limited to 'cloud-tenant-base')
-rw-r--r--cloud-tenant-base/is-base-pom-module.txt1
-rw-r--r--cloud-tenant-base/pom.xml2
2 files changed, 2 insertions, 1 deletions
diff --git a/cloud-tenant-base/is-base-pom-module.txt b/cloud-tenant-base/is-base-pom-module.txt
index e69de29bb2d..ea1e494bc0b 100644
--- a/cloud-tenant-base/is-base-pom-module.txt
+++ b/cloud-tenant-base/is-base-pom-module.txt
@@ -0,0 +1 @@
+Used to skip 'hosted-build-vespa-application' profile when building hosted-tenant-base itself \ No newline at end of file
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>