diff options
| -rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 1 | ||||
| -rw-r--r-- | container-dependencies-enforcer/pom.xml | 1 | ||||
| -rw-r--r-- | container-test/pom.xml | 10 |
3 files changed, 10 insertions, 2 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 1a485460b2e..42eef0ad3de 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -170,6 +170,7 @@ <include>com.yahoo.vespa:tenant-cd-commons:*:test</include> <include>com.yahoo.vespa:vespa-feed-client:*:test</include> <include>com.yahoo.vespa:vespa-feed-client-api:*:test</include> + <include>com.yahoo.vespa:vespaclient-container-plugin:*:test</include> <include>com.yahoo.vespa:vespaclient-core:*:test</include> <include>com.yahoo.vespa:vsm:*:test</include> diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index 47ff49e083f..38988ddeabc 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -146,6 +146,7 @@ <include>com.yahoo.vespa:searchsummary:*:test</include> <include>com.yahoo.vespa:standalone-container:*:test</include> <include>com.yahoo.vespa:storage:*:test</include> + <include>com.yahoo.vespa:vespaclient-container-plugin:*:test</include> <include>com.yahoo.vespa:vespaclient-core:*:test</include> <include>com.yahoo.vespa:vsm:*:test</include> diff --git a/container-test/pom.xml b/container-test/pom.xml index a0358e79a8f..a22d0b59ace 100644 --- a/container-test/pom.xml +++ b/container-test/pom.xml @@ -32,12 +32,18 @@ </exclusion> </exclusions> </dependency> - <!-- Excluded above, and re-declared here, to work around a presumed Maven bug which otherwise puts this - in provided scope when container-test is declared before, and together with, the container artifact --> <dependency> + <!-- Excluded above, and re-declared here, to work around a presumed Maven bug which otherwise puts this + in provided scope when container-test is declared before, and together with, the container artifact --> <groupId>org.bouncycastle</groupId> <artifactId>bcpkix-jdk18on</artifactId> </dependency> + <dependency> + <!-- Not sure if this is needed, added after removing it from 'container' to ensure unchanged test classpath--> + <groupId>com.yahoo.vespa</groupId> + <artifactId>vespaclient-container-plugin</artifactId> + <version>${project.version}</version> + </dependency> <!-- All dependencies that should be visible in test classpath, but not compile classpath, for user projects must be added in compile scope here. These dependencies are explicitly excluded |