diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2022-06-09 11:22:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-09 11:22:15 +0200 |
| commit | 36a78fa7d9395a90815f24896f9690410c9a05e6 (patch) | |
| tree | 8b0813cc1866e2ceb88b4f14cddd4059509bf215 /hosted-tenant-base | |
| parent | 46ef33bd14f2c12ccdeac9b7c588f12b7cfa9c8c (diff) | |
| parent | f67e05b07124d379eace47c19cff0ac6413fc9b7 (diff) | |
Merge pull request #22988 from vespa-engine/jonmv/allow-junit-engines
Include JUnit engines and their dependencies in the test bundle
Diffstat (limited to 'hosted-tenant-base')
| -rw-r--r-- | hosted-tenant-base/pom.xml | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/hosted-tenant-base/pom.xml b/hosted-tenant-base/pom.xml index 7e68f2e1acb..2bb292a50f6 100644 --- a/hosted-tenant-base/pom.xml +++ b/hosted-tenant-base/pom.xml @@ -252,17 +252,15 @@ <extensions>true</extensions> <configuration> <!-- override default test bundle scope translation which translates 'test' to 'compile' --> - <!-- note: ordering affects how overrides are evaluated! --> + <!-- note: ordering affects how overrides are evaluated; put the most specific overrides first! --> <testBundleScopeOverrides> ${extraTestBundleScopeOverrides}, - org.junit.jupiter:junit-jupiter-api:provided, - org.junit.jupiter:junit-jupiter-engine:test, - org.junit.vintage:junit-vintage-engine:test, - com.yahoo.vespa:application:test, - com.yahoo.vespa:container-test:test, - com.yahoo.vespa:vespa-feed-client:test, <!-- prevent effective compile scope of vespa-feed-client in test bundle --> - com.yahoo.vespa:vespa-feed-client-api:provided, - com.yahoo.vespa:tenant-cd-api:provided + org.junit.jupiter:junit-jupiter-api:provided, <!-- ensure the api bundle provided by the tester container is used --> + com.yahoo.vespa:application:test, <!-- its transitive dependencies should be provided by the regular container --> + com.yahoo.vespa:container-test:test, <!-- its transitive dependencies should be provided by the regular container --> + com.yahoo.vespa:vespa-feed-client:test, <!-- ensure the implementation provided by the tester container is used --> + com.yahoo.vespa:vespa-feed-client-api:provided, <!-- ensure the api bundle provided by the tester container is used --> + com.yahoo.vespa:tenant-cd-api:provided <!-- ensure the api bundle provided by the tester container is used --> </testBundleScopeOverrides> </configuration> <executions> |