diff options
author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2017-11-22 22:45:52 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-22 22:45:52 +0100 |
commit | 0f3ec8f7dc2629b22f542fbbfdf51254cc537041 (patch) | |
tree | e76cc80b2a39994571e54b9c6fcfdfe07f0dc47c /controller-server | |
parent | 501d1ac52a4ce9347f194621768a0fdb62a550f1 (diff) | |
parent | 67aa2ba6f93a142522bd06c2bbd443959f337f26 (diff) |
Merge pull request #4251 from vespa-engine/bjorncs/exclude-jackson-from-athenz-deps
Exclude all Jackson deps from athenz zms/zts java client
Diffstat (limited to 'controller-server')
-rw-r--r-- | controller-server/pom.xml | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/controller-server/pom.xml b/controller-server/pom.xml index 2e706f6df24..0cfcbc40601 100644 --- a/controller-server/pom.xml +++ b/controller-server/pom.xml @@ -152,6 +152,19 @@ <groupId>org.bouncycastle</groupId> <artifactId>bcprov-jdk15on</artifactId> </exclusion> + <!--Exclude all Jackson bundles provided by JDisc --> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + </exclusion> </exclusions> </dependency> @@ -164,6 +177,19 @@ <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> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + </exclusion> </exclusions> </dependency> |