Repository: ranger Updated Branches: refs/heads/ranger-1.1 8e19e67e2 -> 46d31a92c
RANGER-2226 - Define explicit (test) dependency on json-smart in the Knox agent Signed-off-by: Colm O hEigeartaigh <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/5c1c35cf Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/5c1c35cf Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/5c1c35cf Branch: refs/heads/ranger-1.1 Commit: 5c1c35cfbcda9fa59be77ecc8cef670c79e7be8a Parents: 1b33545 Author: Colm O hEigeartaigh <[email protected]> Authored: Fri Sep 14 12:36:23 2018 +0100 Committer: Mehul Parikh <[email protected]> Committed: Wed Sep 19 11:09:07 2018 +0530 ---------------------------------------------------------------------- knox-agent/pom.xml | 16 ++++++++++++++++ pom.xml | 1 + 2 files changed, 17 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ranger/blob/5c1c35cf/knox-agent/pom.xml ---------------------------------------------------------------------- diff --git a/knox-agent/pom.xml b/knox-agent/pom.xml index 8f16ca2..1f61d30 100644 --- a/knox-agent/pom.xml +++ b/knox-agent/pom.xml @@ -112,6 +112,18 @@ <artifactId>gateway-server</artifactId> <scope>test</scope> <version>${knox.gateway.version}</version> + <exclusions> + <exclusion> + <groupId>net.minidev</groupId> + <artifactId>json-smart</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>net.minidev</groupId> + <artifactId>json-smart</artifactId> + <scope>test</scope> + <version>${jsonsmart.version}</version> </dependency> <dependency> <groupId>org.apache.knox</groupId> @@ -129,6 +141,10 @@ <groupId>org.apache.knox</groupId> <artifactId>gateway-provider-security-pac4j</artifactId> </exclusion> + <exclusion> + <groupId>net.minidev</groupId> + <artifactId>json-smart</artifactId> + </exclusion> </exclusions> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ranger/blob/5c1c35cf/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 4d7eddc..542f333 100644 --- a/pom.xml +++ b/pom.xml @@ -181,6 +181,7 @@ <jettison.version>1.1</jettison.version> <jline.version>0.9.94</jline.version> <json4s.version>3.2.11</json4s.version> + <jsonsmart.version>2.3</jsonsmart.version> <jsr305.version>1.3.9</jsr305.version> <junit.version>4.12</junit.version> <kafka.version>1.0.0</kafka.version>
