diff options
author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2017-09-22 16:57:39 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-22 16:57:39 +0200 |
commit | 6783001a8fbe4179049d5a37cf97a38d82012488 (patch) | |
tree | d26035d33b2f4f0c839b09633461cd33d7c08db0 | |
parent | 50cf2dfb8548de2827be1a5007dd10f393afed0c (diff) | |
parent | 7ad6f93088851df98d2601910cc07fb559c6bf06 (diff) |
Merge pull request #3503 from vespa-engine/gjoranv/bouncycastle
Provide bouncycastle on test classpath.
-rw-r--r-- | application/pom.xml | 10 | ||||
-rw-r--r-- | pom.xml | 3 |
2 files changed, 12 insertions, 1 deletions
diff --git a/application/pom.xml b/application/pom.xml index 208344042a4..17e9ece3543 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -133,6 +133,16 @@ <artifactId>commons-digester</artifactId> <version>1.8</version> </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcpkix-jdk15on</artifactId> + <version>${bouncycastle.version}</version> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15on</artifactId> + <version>${bouncycastle.version}</version> + </dependency> </dependencies> <build> @@ -893,7 +893,8 @@ <aries.spifly.version>1.0.8</aries.spifly.version> <aries.util.version>1.0.0</aries.util.version> <asm-debug-all.version>5.0.3</asm-debug-all.version> - <!-- WARNING: If you change this version, you also need to update + <bouncycastle.version>1.49</bouncycastle.version> + <!-- WARNING: If you change curator version, you also need to update zkfacade/src/main/java/org/apache/curator/**/package-info.java using something like find zkfacade/src/main/java/org/apache/curator -name package-info.java | \ |