diff options
Diffstat (limited to 'hosted-tenant-base')
| -rw-r--r-- | hosted-tenant-base/is-base-pom-module.txt | 1 | ||||
| -rw-r--r-- | hosted-tenant-base/pom.xml | 23 |
2 files changed, 21 insertions, 3 deletions
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> |