You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by co...@apache.org on 2018/09/17 09:40:39 UTC

ranger git commit: RANGER-2226 - Define explicit (test) dependency on json-smart in the Knox agent

Repository: ranger
Updated Branches:
  refs/heads/master 09bfd1bb3 -> 46a75938b


RANGER-2226 - Define explicit (test) dependency on json-smart in the Knox agent

Signed-off-by: Colm O hEigeartaigh <co...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/46a75938
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/46a75938
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/46a75938

Branch: refs/heads/master
Commit: 46a75938bfa58676044361b597bd52d1496804a0
Parents: 09bfd1b
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Sep 14 12:36:23 2018 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Sep 17 10:28:28 2018 +0100

----------------------------------------------------------------------
 knox-agent/pom.xml | 16 ++++++++++++++++
 pom.xml            |  1 +
 2 files changed, 17 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ranger/blob/46a75938/knox-agent/pom.xml
----------------------------------------------------------------------
diff --git a/knox-agent/pom.xml b/knox-agent/pom.xml
index 1d8fdae..0c45c84 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/46a75938/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ae3f4be..41bcd90 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>