diff options
-rw-r--r-- | cloud-tenant-base/pom.xml | 4 | ||||
-rw-r--r-- | hosted-tenant-base/pom.xml | 20 |
2 files changed, 14 insertions, 10 deletions
diff --git a/cloud-tenant-base/pom.xml b/cloud-tenant-base/pom.xml index 99e2c5badc6..e3c51f0d90b 100644 --- a/cloud-tenant-base/pom.xml +++ b/cloud-tenant-base/pom.xml @@ -39,7 +39,9 @@ <properties> <endpoint>https://api.vespa-external.aws.oath.cloud:4443</endpoint> - <bundlePluginExtraTestProvidedDependencies>com.yahoo.vespa:cloud-tenant-cd</bundlePluginExtraTestProvidedDependencies> + <extraTestBundleScopeOverrides> + com.yahoo.vespa:cloud-tenant-cd:provided + </extraTestBundleScopeOverrides> </properties> diff --git a/hosted-tenant-base/pom.xml b/hosted-tenant-base/pom.xml index d453da74b74..40fc041204d 100644 --- a/hosted-tenant-base/pom.xml +++ b/hosted-tenant-base/pom.xml @@ -40,7 +40,7 @@ <test.categories>!integration</test.categories> <!-- To allow specialized base pom to include additional "test provided" dependencies --> - <bundlePluginExtraTestProvidedDependencies/> + <extraTestBundleScopeOverrides/> <!-- Must be specified by specialized base pom. Can also be overriden by application --> <endpoint/> @@ -187,14 +187,16 @@ <version>${vespaversion}</version> <extensions>true</extensions> <configuration> - <testProvidedArtifacts> - ${bundlePluginExtraTestProvidedDependencies}, - 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> + <!-- override default test bundle scope translation which translates 'test' to 'compile' --> + <!-- note: ordering affects how overrides are evaluated! --> + <testBundleScopeOverrides> + ${extraTestBundleScopeOverrides}, + com.yahoo.vespa:application:test, + com.yahoo.vespa:container-test:runtime, + org.junit.jupiter:junit-jupiter-api:provided, + org.junit.jupiter:junit-jupiter-engine:test, + com.yahoo.vespa:tenant-cd-api:provided + </testBundleScopeOverrides> </configuration> <executions> <execution> |