diff options
| author | gjoranv <gv@oath.com> | 2018-03-07 16:54:21 +0100 |
|---|---|---|
| committer | gjoranv <gv@oath.com> | 2018-03-07 17:10:18 +0100 |
| commit | d8d690817817ff704119bd33630fe48ad3f3e8be (patch) | |
| tree | 106909211dcb15b1ec2c7bf78709c632e8ff08b4 | |
| parent | b51ad76a2c2cd8a36b356f196e470e1cfc5a60e6 (diff) | |
Use bouncycastle from container-dev.
| -rw-r--r-- | athenz-identity-provider-service/pom.xml | 20 | ||||
| -rw-r--r-- | controller-server/pom.xml | 7 | ||||
| -rw-r--r-- | docker-api/pom.xml | 8 | ||||
| -rw-r--r-- | node-admin/pom.xml | 10 | ||||
| -rw-r--r-- | vespa-athenz/pom.xml | 10 |
5 files changed, 17 insertions, 38 deletions
diff --git a/athenz-identity-provider-service/pom.xml b/athenz-identity-provider-service/pom.xml index 257c1caf447..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>provided</scope> - </dependency> - <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> - <scope>provided</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> diff --git a/controller-server/pom.xml b/controller-server/pom.xml index c1664981657..954475508d3 100644 --- a/controller-server/pom.xml +++ b/controller-server/pom.xml @@ -100,13 +100,6 @@ <scope>provided</scope> </dependency> - <!-- required for Athenz libraries --> - <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcpkix-jdk15on</artifactId> - <scope>provided</scope> - </dependency> - <!-- compile --> <dependency> diff --git a/docker-api/pom.xml b/docker-api/pom.xml index e2ddd8dbcc9..e82bc86d349 100644 --- a/docker-api/pom.xml +++ b/docker-api/pom.xml @@ -73,6 +73,14 @@ <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> </exclusion> + <exclusion> + <groupId>org.bouncycastle</groupId> + <artifactId>bcpkix-jdk15on</artifactId> + </exclusion> + <exclusion> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15on</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/node-admin/pom.xml b/node-admin/pom.xml index f8ac9f4d9e1..b5e21ce7385 100644 --- a/node-admin/pom.xml +++ b/node-admin/pom.xml @@ -132,16 +132,6 @@ <artifactId>velocity</artifactId> <scope>compile</scope> </dependency> - <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcpkix-jdk15on</artifactId> - <scope>provided</scope> - </dependency> </dependencies> <build> <plugins> diff --git a/vespa-athenz/pom.xml b/vespa-athenz/pom.xml index 1f7fb789de1..835c9bb178c 100644 --- a/vespa-athenz/pom.xml +++ b/vespa-athenz/pom.xml @@ -23,16 +23,6 @@ <version>${project.version}</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcpkix-jdk15on</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> - <scope>provided</scope> - </dependency> <!-- test --> <dependency> |