Repository: incubator-ranger Updated Branches: refs/heads/master 7bb686873 -> 8335bdeac
RANGER-313: added hadoop-hdfs library back to WEB-INF/lib, as it is needed by credential builder; added hbase libraries to hbase plugin directory Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/8335bdea Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/8335bdea Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/8335bdea Branch: refs/heads/master Commit: 8335bdeacc0fcda9aabff8eb4cee14b2e682c9f5 Parents: d017b31 Author: Madhan Neethiraj <[email protected]> Authored: Mon Mar 16 00:53:50 2015 -0700 Committer: Madhan Neethiraj <[email protected]> Committed: Mon Mar 16 00:54:02 2015 -0700 ---------------------------------------------------------------------- security-admin/pom.xml | 11 +++++------ src/main/assembly/admin-web.xml | 21 +++++++++------------ 2 files changed, 14 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8335bdea/security-admin/pom.xml ---------------------------------------------------------------------- diff --git a/security-admin/pom.xml b/security-admin/pom.xml index 1c17f81..78b7e7f 100644 --- a/security-admin/pom.xml +++ b/security-admin/pom.xml @@ -382,6 +382,11 @@ </exclusions> </dependency> <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + <version>${hadoop.version}</version> + </dependency> + <dependency> <groupId>org.apache.ranger</groupId> <artifactId>unixauthclient</artifactId> <version>${project.version}</version> @@ -396,12 +401,6 @@ <artifactId>spring-test</artifactId> <version>${springframework.test.version}</version> </dependency> - <dependency> - <groupId>org.apache.hive</groupId> - <artifactId>hive-jdbc</artifactId> - <version>${hive.version}</version> - <scope>runtime</scope> - </dependency> </dependencies> <build> <pluginManagement> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8335bdea/src/main/assembly/admin-web.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/admin-web.xml b/src/main/assembly/admin-web.xml index d4a8a91..86b5d5b 100644 --- a/src/main/assembly/admin-web.xml +++ b/src/main/assembly/admin-web.xml @@ -54,15 +54,6 @@ <unpack>false</unpack> <directoryMode>755</directoryMode> <fileMode>644</fileMode> - <dependencySets> - <dependencySet> - <includes> - <include>org.apache.hadoop:hadoop-hdfs:jar:${hadoop-common.version}</include> - <include>org.apache.hadoop:hadoop-auth:jar:${hadoop-common.version}</include> - <include>org.apache.hadoop:hadoop-common:jar:${hadoop-common.version}</include> - </includes> - </dependencySet> - </dependencySets> </binaries> <includes> <include>security_plugins.ranger-hdfs-plugin:ranger-hdfs-plugin</include> @@ -79,7 +70,11 @@ <dependencySets> <dependencySet> <includes> + <include>org.apache.hive:hive-common:jar:${hive.version}</include> + <include>org.apache.hive:hive-service:jar:${hive.version}</include> + <include>org.apache.hive:hive-exec:jar:${hive.version}</include> <include>org.apache.hive:hive-jdbc:jar:${hive.version}</include> + <include>org.apache.hive:hive-metastore:jar:${hive.version}</include> </includes> </dependencySet> </dependencySets> @@ -89,6 +84,7 @@ </includes> </moduleSet> + <moduleSet> <binaries> <includeDependencies>true</includeDependencies> @@ -99,10 +95,11 @@ <dependencySets> <dependencySet> <includes> + <include>org.apache.hbase:hbase-common:jar:${hbase.version}</include> + <include>org.apache.hbase:hbase-client:jar:${hbase.version}</include> + <include>org.apache.hbase:hbase-protocol:jar:${hbase.version}</include> <include>org.apache.hbase:hbase-server:jar:${hbase.version}</include> - <include>org.apache.hadoop:hadoop-hdfs:jar:${hadoop-common.version}</include> - <include>org.apache.hadoop:hadoop-auth:jar:${hadoop-common.version}</include> - <include>org.apache.hadoop:hadoop-common:jar:${hadoop-common.version}</include> + <include>org.htrace:htrace-core</include> </includes> </dependencySet> </dependencySets>
