summaryrefslogtreecommitdiffstats
path: root/controller-server/pom.xml
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@oath.com>2017-10-16 12:13:04 +0200
committerBjørn Christian Seime <bjorncs@oath.com>2017-10-16 12:13:04 +0200
commit8e22dbbac60165e2c887e05d33961ed6fa4b6a0f (patch)
treee5579a0c2e1d85e796d4751a8f224f97b24ec36d /controller-server/pom.xml
parenta21f0df17e4ac59244a153ca4ba2ad0dc8ebee74 (diff)
Revert "Open-source Athenz integration for controller-server"
This reverts commit 2d12b78dc2dd3a755e9a9dd05fa7f98acb2f544c.
Diffstat (limited to 'controller-server/pom.xml')
-rw-r--r--controller-server/pom.xml50
1 files changed, 0 insertions, 50 deletions
diff --git a/controller-server/pom.xml b/controller-server/pom.xml
index 2e706f6df24..fa21098a092 100644
--- a/controller-server/pom.xml
+++ b/controller-server/pom.xml
@@ -92,13 +92,6 @@
<scope>provided</scope>
</dependency>
- <!-- required for Athenz libraries -->
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
- <scope>provided</scope>
- </dependency>
-
<!-- compile -->
<dependency>
@@ -124,49 +117,6 @@
<version>1.6</version>
</dependency>
- <dependency>
- <groupId>com.yahoo.athenz</groupId>
- <artifactId>athenz-zms-java-client</artifactId>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- <!-- Exclude all Jersey bundles provided by JDisc -->
- <exclusion>
- <groupId>org.glassfish.jersey.core</groupId>
- <artifactId>jersey-client</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-json-jackson</artifactId>
- </exclusion>
- <!-- BouncyCastle is not bundled due to class loading issues
- when security provider is registered from inside a OSGi bundle -->
- <exclusion>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>com.yahoo.athenz</groupId>
- <artifactId>athenz-zts-java-client</artifactId>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
<!-- test -->
<dependency>