diff options
| author | gjoranv <gjoranv@gmail.com> | 2018-03-08 10:12:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-08 10:12:03 +0100 |
| commit | fd7b5360f0811d5c7f2ffe2bb0784fac7ef95299 (patch) | |
| tree | 9fb989df923df0461362cebc1f7c13f6737d95c0 /athenz-identity-provider-service | |
| parent | 4e24502412bbac1ff6e8ae4ee5fa26590996189f (diff) | |
| parent | 3da504c88e805f5c7e722c992726d961d8e339ab (diff) | |
Merge pull request #5242 from vespa-engine/bjorncs/bouncycastle-preinstall
bjorncs+gv/bouncycastle preinstall
Diffstat (limited to 'athenz-identity-provider-service')
| -rw-r--r-- | athenz-identity-provider-service/pom.xml | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/athenz-identity-provider-service/pom.xml b/athenz-identity-provider-service/pom.xml index 50d045a8198..86d4defa861 100644 --- a/athenz-identity-provider-service/pom.xml +++ b/athenz-identity-provider-service/pom.xml @@ -64,25 +64,23 @@ <artifactId>httpcore</artifactId> </dependency> <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcpkix-jdk15on</artifactId> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> - <scope>compile</scope> - </dependency> - <dependency> <groupId>com.yahoo.athenz</groupId> <artifactId>athenz-zts-java-client</artifactId> <scope>compile</scope> <exclusions> + <!--Exclude all bundles provided by JDisc --> + <exclusion> + <groupId>org.bouncycastle</groupId> + <artifactId>bcpkix-jdk15on</artifactId> + </exclusion> + <exclusion> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15on</artifactId> + </exclusion> <exclusion> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </exclusion> - <!--Exclude all Jackson bundles provided by JDisc --> <exclusion> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> |