Repository: incubator-ranger
Updated Branches:
  refs/heads/master e2fc9c98f -> 437e10a90


RANGER-1062 : Remove conflicting jars from Ranger Atlas plugin

Signed-off-by: Madhan Neethiraj <[email protected]>


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

Branch: refs/heads/master
Commit: 437e10a908c16b9e7e590be522773071298e547d
Parents: e2fc9c9
Author: Gautam Borad <[email protected]>
Authored: Fri Jun 24 19:17:38 2016 +0530
Committer: Madhan Neethiraj <[email protected]>
Committed: Fri Jun 24 08:31:39 2016 -0700

----------------------------------------------------------------------
 src/main/assembly/plugin-atlas.xml | 31 ++++++++-----------------------
 1 file changed, 8 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/437e10a9/src/main/assembly/plugin-atlas.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/plugin-atlas.xml 
b/src/main/assembly/plugin-atlas.xml
index 6bdeb80..7fd1330 100644
--- a/src/main/assembly/plugin-atlas.xml
+++ b/src/main/assembly/plugin-atlas.xml
@@ -49,28 +49,13 @@
             <dependencySet>
                 
<outputDirectory>/lib/ranger-atlas-plugin-impl</outputDirectory>
                 <includes>
-                       
<include>org.apache.hadoop:hadoop-common:jar:${hadoop-common.version}</include>
-                                       
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop-common.version}</include>
-                                       
<include>com.google.code.gson:gson</include>
-                                       
<include>org.eclipse.persistence:eclipselink</include>
-                                       
<include>org.eclipse.persistence:javax.persistence</include>
-                                       
<include>com.sun.jersey:jersey-bundle</include>
-                                       
<include>com.google.guava:guava:jar:${guava.version}</include>
-                                       
<include>org.codehaus.jackson:jackson-core-asl</include>
-                                       
<include>org.codehaus.jackson:jackson-jaxrs</include>
-                                       
<include>org.codehaus.jackson:jackson-mapper-asl</include>
-                                       
<include>org.codehaus.jackson:jackson-xc</include>
-                    
<include>commons-configuration:commons-configuration</include>
-                               <include>com.google.code.gson:gson*</include>
-                           
<include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
-                               
<include>org.noggit:noggit:jar:${noggit.version}</include>
-                               
<include>com.google.protobuf:protobuf-java:jar:${protobuf-java.version}</include>
-                               
<include>org.apache.hadoop:hadoop-hdfs:jar:${hadoop.version}</include>
-                                       
<include>org.apache.hadoop:hadoop-common:jar:${hadoop-common.version}</include>
-                               
<include>org.apache.htrace:htrace-core:jar:${htrace-core.version}</include>
-                                       
<include>org.codehaus.jackson:jackson-core-asl:jar:${codehaus.jackson.version}</include>
-                                       
<include>org.codehaus.jackson:jackson-mapper-asl:jar:${codehaus.jackson.version}</include>
-                                       
<include>org.apache.solr:solr-solrj</include>
+                    <include>org.eclipse.persistence:eclipselink</include>
+                    
<include>org.eclipse.persistence:javax.persistence</include>
+                    <include>com.sun.jersey:jersey-bundle</include>
+                    
<include>com.google.guava:guava:jar:${guava.version}</include>
+                    
<include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
+                    
<include>org.apache.hadoop:hadoop-hdfs:jar:${hadoop.version}</include>
+                    <include>org.apache.solr:solr-solrj</include>
                        </includes>
                 <unpack>false</unpack>
             </dependencySet>
@@ -93,7 +78,7 @@
                                                        
<include>org.apache.ranger:ranger-plugins-cred</include>
                                                        
<include>org.apache.ranger:credentialbuilder</include>
                                                </includes>
-                                       </dependencySet>
+                       </dependencySet>
         </dependencySets>
         <outputDirectory>/lib/ranger-atlas-plugin-impl</outputDirectory>
      </binaries>

Reply via email to