diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-07-06 14:50:33 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-07-06 14:59:23 +0200 |
| commit | 57ca39294dd77d5033211d342661609078f62276 (patch) | |
| tree | ff34dae8c4fa2ba90f23513910ea18a8b8daddec /hosted-tenant-base | |
| parent | 3234aba2bf97ff2d90c5218edb5a9894d156f084 (diff) | |
Update tenant base poms to use new bundle-plugin config
Diffstat (limited to 'hosted-tenant-base')
| -rw-r--r-- | hosted-tenant-base/pom.xml | 20 |
1 files changed, 11 insertions, 9 deletions
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> |