Repository: incubator-ranger Updated Branches: refs/heads/tag-policy c930d5633 -> e95d83fee
RANGER-574: fixes to add hdfs jars to knox/kms/storm bundles (Changes from Ramesh Mani) Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/bfe4ab2e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/bfe4ab2e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/bfe4ab2e Branch: refs/heads/tag-policy Commit: bfe4ab2e16cd3a66a24e3e9dd6a2bdc8f0aa4bbe Parents: 7ac57a4 Author: sneethiraj <[email protected]> Authored: Tue Jun 30 10:21:46 2015 -0400 Committer: sneethiraj <[email protected]> Committed: Tue Jun 30 10:21:46 2015 -0400 ---------------------------------------------------------------------- kms/pom.xml | 5 +++++ knox-agent/pom.xml | 12 +++++++++++- pom.xml | 1 + src/main/assembly/kms.xml | 7 ++++++- src/main/assembly/knox-agent.xml | 9 ++++++--- src/main/assembly/storm-agent.xml | 4 ++++ storm-agent/pom.xml | 15 +++++++++++++++ 7 files changed, 48 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/bfe4ab2e/kms/pom.xml ---------------------------------------------------------------------- diff --git a/kms/pom.xml b/kms/pom.xml index a726a86..877ad95 100644 --- a/kms/pom.xml +++ b/kms/pom.xml @@ -441,6 +441,11 @@ <artifactId>noggit</artifactId> <version>${noggit.version}</version> </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + <version>${hadoop.version}</version> + </dependency> </dependencies> <build> <pluginManagement> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/bfe4ab2e/knox-agent/pom.xml ---------------------------------------------------------------------- diff --git a/knox-agent/pom.xml b/knox-agent/pom.xml index d817836..85506df 100644 --- a/knox-agent/pom.xml +++ b/knox-agent/pom.xml @@ -94,10 +94,20 @@ <artifactId>commons-lang</artifactId> <version>${commons.lang.version}</version> </dependency> - <dependency> + <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> <version>${commons.collections.version}</version> </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + <version>${hadoop.version}</version> + </dependency> + <dependency> + <groupId>org.htrace</groupId> + <artifactId>htrace-core</artifactId> + <version>${htrace-core.version}</version> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/bfe4ab2e/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 0cd84f3..99a23b2 100644 --- a/pom.xml +++ b/pom.xml @@ -132,6 +132,7 @@ <hadoop-common.version>2.7.0</hadoop-common.version> <hadoop-common-kms.version>2.7.0</hadoop-common-kms.version> <hadoop.version>2.7.0</hadoop.version> + <htrace-core.version>3.0.4</htrace-core.version> <hamcrest.all.version>1.3</hamcrest.all.version> <hbase.version>1.1.0</hbase.version> <hive.version>1.2.0</hive.version> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/bfe4ab2e/src/main/assembly/kms.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/kms.xml b/src/main/assembly/kms.xml index a2e0e2a..33da248 100755 --- a/src/main/assembly/kms.xml +++ b/src/main/assembly/kms.xml @@ -96,12 +96,14 @@ <include>com.google.code.findbugs:jsr305</include> <include>io.netty:netty</include> <include>com.thoughtworks.paranamer:paranamer</include> - <include>com.google.protobuf:protobuf-java</include> <include>org.xerial.snappy:snappy-java</include> <include>xmlenc:xmlenc</include> <include>org.tukaani:xz</include> <include>org.apache.httpcomponents:httpmime:jar:${httpcomponent.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.htrace:htrace-core:jar:${htrace-core.version}</include> </includes> </dependencySet> </dependencySets> @@ -135,6 +137,9 @@ <includes> <include>org.apache.tomcat.embed:tomcat-embed*</include> <include>org.eclipse.jdt.core.compiler:ecj:jar:P20140317-1600</include> + <include>com.google.protobuf:protobuf-java:jar:${protobuf-java.version}</include> + <include>org.apache.hadoop:hadoop-hdfs:jar:${hadoop.version}</include> + <include>org.htrace:htrace-core:jar:${htrace-core.version}</include> </includes> <unpack>false</unpack> </dependencySet> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/bfe4ab2e/src/main/assembly/knox-agent.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/knox-agent.xml b/src/main/assembly/knox-agent.xml index 85a1d92..d21487a 100644 --- a/src/main/assembly/knox-agent.xml +++ b/src/main/assembly/knox-agent.xml @@ -35,9 +35,12 @@ <outputDirectory>/lib</outputDirectory> <includes> <include>commons-configuration:commons-configuration</include> - <include>org.apache.httpcomponents:httpmime:jar:${httpcomponent.httpmime.version}</include> - <include>org.noggit:noggit:jar:${noggit.version}</include> - </includes> + <include>org.apache.httpcomponents:httpmime:jar:${httpcomponent.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.htrace:htrace-core:jar:${htrace-core.version}</include> + </includes> <unpack>false</unpack> </dependencySet> </dependencySets> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/bfe4ab2e/src/main/assembly/storm-agent.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/storm-agent.xml b/src/main/assembly/storm-agent.xml index bbf8543..8753e43 100644 --- a/src/main/assembly/storm-agent.xml +++ b/src/main/assembly/storm-agent.xml @@ -52,6 +52,10 @@ <include>org.apache.httpcomponents:httpcore:jar:${httpcomponent.httpcore.version}</include> <include>org.apache.httpcomponents:httpmime:jar:${httpcomponent.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.htrace:htrace-core:jar:${htrace-core.version}</include> + <include>commons-cli:commons-cli:jar:${commons.cli.version}</include> </includes> </dependencySet> <dependencySet> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/bfe4ab2e/storm-agent/pom.xml ---------------------------------------------------------------------- diff --git a/storm-agent/pom.xml b/storm-agent/pom.xml index 5075987..b59bd8c 100644 --- a/storm-agent/pom.xml +++ b/storm-agent/pom.xml @@ -52,5 +52,20 @@ <artifactId>credentialbuilder</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + <version>${hadoop.version}</version> + </dependency> + <dependency> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + <version>${commons.cli.version}</version> + </dependency> + <dependency> + <groupId>org.htrace</groupId> + <artifactId>htrace-core</artifactId> + <version>${htrace-core.version}</version> + </dependency> </dependencies> </project>
