Merge pull request #13770 from vespa-engine/bjorncs/hosted-tenant-base

Bjorncs/hosted tenant base

5 files changed, 35 insertions, 6 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>
diff --git a/hosted-tenant-base/is-base-pom-module.txt b/hosted-tenant-base/is-base-pom-module.txt
index e69de29bb2d..2b8523fd4bc 100644
--- a/hosted-tenant-base/is-base-pom-module.txt
+++ b/hosted-tenant-base/is-base-pom-module.txt
@@ -0,0 +1 @@
+Used to skip 'hosted-build-vespa-application' profile in 'hosted-tenant-base' when building 'cloud-tenant-base' itself
\ No newline at end of file
diff --git a/hosted-tenant-base/pom.xml b/hosted-tenant-base/pom.xml
index faf8b4295e7..03466255362 100644
--- a/hosted-tenant-base/pom.xml
+++ b/hosted-tenant-base/pom.xml
@@ -33,13 +33,28 @@
 
     <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>
+        <junit.version>5.6.2</junit.version> <!-- NOTE: this must be in sync with junit version specified in 'tenant-cd-api' -->
         <test.categories>!integration</test.categories>
+
+        <!-- To allow specialized base pom to include additional "test provided" dependencies -->
         <bundlePluginExtraTestProvidedDependencies/>
+
+        <!-- Must be specified by specialized base pom. Can also be overriden by application -->
+        <endpoint/>
+
+        <!-- Properties that are specified by application pom -->
+        <tenant/>
+        <application/>
+        <instance/>
+        <environment/>
+        <region/>
+        <apiKeyFile/>
+        <apiCertificateFile/>
+        <dataPlaneKeyFile/>
+        <dataPlaneCertificateFile/>
     </properties>
 
     <dependencyManagement>
@@ -86,7 +101,7 @@
         <dependency>
             <groupId>com.yahoo.vespa</groupId>
             <artifactId>tenant-cd-api</artifactId>
-            <version>${test-framework.version}</version>
+            <version>${vespaversion}</version>
             <scope>test</scope>
         </dependency>
 
@@ -177,6 +192,7 @@
                                 com.yahoo.vespa:tenant-cd-api,
                                 com.yahoo.vespa:container-test,
                                 org.junit.jupiter:junit-jupiter-api,
+                                org.junit.jupiter:junit-jupiter-engine,
                                 !com.yahoo.vespa:application
                             </testProvidedArtifacts>
                         </configuration>
@@ -229,6 +245,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-antrun-plugin</artifactId>
+                        <version>1.3</version>
                         <executions>
                             <execution>
                                 <id>attach-artifact</id>
diff --git a/tenant-cd-api/pom.xml b/tenant-cd-api/pom.xml
index 23e5f3ec3f4..47e0f6e3fe6 100644
--- a/tenant-cd-api/pom.xml
+++ b/tenant-cd-api/pom.xml
@@ -19,6 +19,16 @@
         <relativePath>../parent</relativePath>
     </parent>
 
+    <properties>
+
+        <!--
+            This version must match the string in all ExportPackage annotations.
+            It must also be in sync junit version specified in 'hosted-tenant-base'.
+        -->
+        <hosted-tenant-base-junit-version>5.6.2</hosted-tenant-base-junit-version>
+
+    </properties>
+
     <dependencies>
         <!-- provided -->
         <dependency>
@@ -42,10 +52,10 @@
         </dependency>
 
         <!-- compile -->
-        <dependency> <!-- TODO(bjorncs): share junit version number with test-runner implementation -->
+        <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.6.2</version> <!-- NOTE: This version must match the string in all ExportPackage annotations -->
+            <version>${hosted-tenant-base-junit-version}</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>