summaryrefslogtreecommitdiffstats
path: root/container-test/pom.xml
diff options
context:
space:
mode:
Diffstat (limited to 'container-test/pom.xml')
-rw-r--r--container-test/pom.xml22
1 files changed, 14 insertions, 8 deletions
diff --git a/container-test/pom.xml b/container-test/pom.xml
index ab5a2dc3612..9e0ea06c801 100644
--- a/container-test/pom.xml
+++ b/container-test/pom.xml
@@ -26,8 +26,22 @@
<groupId>biz.aQute.bnd</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.yahoo.vespa</groupId>
+ <artifactId>vespajlib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk15on</artifactId>
+ </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>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk15on</artifactId>
+ </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
@@ -103,14 +117,6 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- </dependency>
- <dependency>
<!-- required for container-search code using org.json -->
<groupId>org.json</groupId>
<artifactId>json</artifactId>