You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by me...@apache.org on 2018/09/19 05:37:34 UTC

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

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/6b5d7871
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/6b5d7871
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/6b5d7871

Branch: refs/heads/ranger-1
Commit: 6b5d787129d0f29e33ac568aba0d8ac87d8eae0d
Parents: 93de9e5
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Sep 14 12:36:23 2018 +0100
Committer: Mehul Parikh <me...@apache.org>
Committed: Wed Sep 19 11:03:47 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/6b5d7871/knox-agent/pom.xml
----------------------------------------------------------------------
diff --git a/knox-agent/pom.xml b/knox-agent/pom.xml
index 3130f29..5fafa73 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/6b5d7871/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0ae3315..4ba8c52 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>