diff options
| author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2017-10-24 11:13:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-24 11:13:55 +0200 |
| commit | 385a40a34979d8e0be49c84c29ad211f7b2c0ce5 (patch) | |
| tree | a52eb4c9cd1b5e56a2e2c2117cab3543d5aa0bc5 | |
| parent | bc8a56cecdf9cc4d0993fcae8c690a2d1629af1b (diff) | |
| parent | f772a30140ef120161742ce3844eae1fa2dcf2ad (diff) | |
Merge pull request #3857 from vespa-engine/bjorncs/exclude-jackson
Bjorncs/exclude jackson
3 files changed, 15 insertions, 4 deletions
diff --git a/container-disc/pom.xml b/container-disc/pom.xml index 5409d9b1a40..b9ce5a1b7ac 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -136,10 +136,25 @@ <artifactId>httpclient</artifactId> <scope>compile</scope> </dependency> + <!-- TODO Use BouncyCastle directly --> <dependency> <groupId>com.yahoo.athenz</groupId> <artifactId>athenz-auth-core</artifactId> <version>${athenz.version}</version> + <exclusions> + <exclusion> + <groupId>com.amazonaws</groupId> + <artifactId>aws-java-sdk-s3</artifactId> + </exclusion> + <exclusion> + <groupId>org.kohsuke</groupId> + <artifactId>libpam4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> <properties> diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/AthenzService.java b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/AthenzService.java index cc5fa6a889b..06dd698988a 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/AthenzService.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/AthenzService.java @@ -20,8 +20,6 @@ public class AthenzService { /** * Send instance register request to ZTS, get InstanceIdentity - * - * @param instanceRegisterInformation */ InstanceIdentity sendInstanceRegisterRequest(InstanceRegisterInformation instanceRegisterInformation, String athenzUrl) { try(CloseableHttpClient client = HttpClientBuilder.create().build()) { diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/ServiceProviderApi.java b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/ServiceProviderApi.java index c6c56d016d9..74e3cfa4a89 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/ServiceProviderApi.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/ServiceProviderApi.java @@ -24,8 +24,6 @@ public class ServiceProviderApi { /** * Get signed identity document from config server - * - * @return */ String getSignedIdentityDocument() { |