Repository: incubator-ranger Updated Branches: refs/heads/master 724c83c9e -> 46b23e54e
RANGER-1017:Audit to Secure Solr needs Solrj Jars from apache to be included in package Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/586753d8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/586753d8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/586753d8 Branch: refs/heads/master Commit: 586753d87c06b96be7fbb58292e4189a26ddb70e Parents: a01cce3 Author: rmani <[email protected]> Authored: Tue Jun 7 11:29:08 2016 -0700 Committer: rmani <[email protected]> Committed: Tue Jun 7 11:29:08 2016 -0700 ---------------------------------------------------------------------- plugin-atlas/pom.xml | 7 ++++++- plugin-kms/pom.xml | 5 +++++ security-admin/pom.xml | 10 +++++----- src/main/assembly/atlas-agent.xml | 2 +- src/main/assembly/hbase-agent.xml | 2 +- src/main/assembly/hdfs-agent.xml | 4 ++-- src/main/assembly/hive-agent.xml | 2 +- src/main/assembly/kms.xml | 2 +- src/main/assembly/knox-agent.xml | 2 +- src/main/assembly/plugin-kafka.xml | 2 +- src/main/assembly/plugin-kms.xml | 2 +- src/main/assembly/plugin-yarn.xml | 2 +- src/main/assembly/storm-agent.xml | 2 +- 13 files changed, 27 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/586753d8/plugin-atlas/pom.xml ---------------------------------------------------------------------- diff --git a/plugin-atlas/pom.xml b/plugin-atlas/pom.xml index 2c82c57..7aad0b1 100644 --- a/plugin-atlas/pom.xml +++ b/plugin-atlas/pom.xml @@ -59,7 +59,12 @@ <groupId>org.apache.atlas</groupId> <artifactId>atlas-common</artifactId> <version>${atlas.version}</version> - </dependency> + </dependency> + <dependency> + <groupId>org.apache.solr</groupId> + <artifactId>solr-solrj</artifactId> + <version>${solr.version}</version> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/586753d8/plugin-kms/pom.xml ---------------------------------------------------------------------- diff --git a/plugin-kms/pom.xml b/plugin-kms/pom.xml index 0a07bc2..714559f 100644 --- a/plugin-kms/pom.xml +++ b/plugin-kms/pom.xml @@ -46,5 +46,10 @@ <artifactId>ranger-kms</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.solr</groupId> + <artifactId>solr-solrj</artifactId> + <version>${solr.version}</version> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/586753d8/security-admin/pom.xml ---------------------------------------------------------------------- diff --git a/security-admin/pom.xml b/security-admin/pom.xml index 25980fc..c69e60c 100644 --- a/security-admin/pom.xml +++ b/security-admin/pom.xml @@ -243,11 +243,11 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.apache.ranger</groupId> - <artifactId>ranger_solrj</artifactId> - <version>${project.version}</version> - </dependency> + <dependency> + <groupId>org.apache.solr</groupId> + <artifactId>solr-solrj</artifactId> + <version>${solr.version}</version> + </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/586753d8/src/main/assembly/atlas-agent.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/atlas-agent.xml b/src/main/assembly/atlas-agent.xml index a1c1cc5..26e4c5d 100644 --- a/src/main/assembly/atlas-agent.xml +++ b/src/main/assembly/atlas-agent.xml @@ -69,6 +69,7 @@ <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> </includes> <unpack>false</unpack> </dependencySet> @@ -96,7 +97,6 @@ <outputDirectory>/lib/ranger-atlas-plugin-impl</outputDirectory> </binaries> <includes> - <include>org.apache.ranger:ranger_solrj</include> <include>org.apache.ranger:ranger-plugins-audit</include> <include>org.apache.ranger:ranger-plugins-cred</include> <include>org.apache.ranger:ranger-plugins-common</include> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/586753d8/src/main/assembly/hbase-agent.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/hbase-agent.xml b/src/main/assembly/hbase-agent.xml index 8a47ef1..0c66dac 100644 --- a/src/main/assembly/hbase-agent.xml +++ b/src/main/assembly/hbase-agent.xml @@ -54,6 +54,7 @@ <include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include> <include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include> <include>org.noggit:noggit:jar:${noggit.version}</include> + <include>org.apache.solr:solr-solrj</include> </includes> <unpack>false</unpack> </dependencySet> @@ -61,7 +62,6 @@ <outputDirectory>/lib/ranger-hbase-plugin-impl</outputDirectory> </binaries> <includes> - <include>org.apache.ranger:ranger_solrj</include> <include>org.apache.ranger:ranger-plugins-audit</include> <include>org.apache.ranger:ranger-plugins-cred</include> <include>org.apache.ranger:ranger-plugins-common</include> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/586753d8/src/main/assembly/hdfs-agent.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/hdfs-agent.xml b/src/main/assembly/hdfs-agent.xml index b099bbb..95901f4 100644 --- a/src/main/assembly/hdfs-agent.xml +++ b/src/main/assembly/hdfs-agent.xml @@ -86,14 +86,14 @@ <include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include> <include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include> <include>org.noggit:noggit:jar:${noggit.version}</include> + <include>org.apache.solr:solr-solrj</include> </includes> <unpack>false</unpack> </dependencySet> </dependencySets> <outputDirectory>/lib/ranger-hdfs-plugin-impl</outputDirectory> </binaries> - <includes> - <include>org.apache.ranger:ranger_solrj</include> + <includes> <include>org.apache.ranger:ranger-plugins-audit</include> <include>org.apache.ranger:ranger-plugins-cred</include> <include>org.apache.ranger:ranger-plugins-common</include> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/586753d8/src/main/assembly/hive-agent.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/hive-agent.xml b/src/main/assembly/hive-agent.xml index 5d83b46..c4d8835 100644 --- a/src/main/assembly/hive-agent.xml +++ b/src/main/assembly/hive-agent.xml @@ -54,6 +54,7 @@ <include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include> <include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include> <include>org.noggit:noggit:jar:${noggit.version}</include> + <include>org.apache.solr:solr-solrj</include> </includes> <unpack>false</unpack> </dependencySet> @@ -61,7 +62,6 @@ <outputDirectory>/lib/ranger-hive-plugin-impl</outputDirectory> </binaries> <includes> - <include>org.apache.ranger:ranger_solrj</include> <include>org.apache.ranger:ranger-plugins-audit</include> <include>org.apache.ranger:ranger-plugins-cred</include> <include>org.apache.ranger:ranger-plugins-common</include> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/586753d8/src/main/assembly/kms.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/kms.xml b/src/main/assembly/kms.xml index 41a2754..0598e39 100755 --- a/src/main/assembly/kms.xml +++ b/src/main/assembly/kms.xml @@ -141,6 +141,7 @@ <include>com.google.protobuf:protobuf-java:jar:${protobuf-java.version}</include> <include>org.apache.hadoop:hadoop-hdfs:jar:${hadoop.version}</include> <include>org.apache.htrace:htrace-core:jar:${htrace-core.version}</include> + <include>org.apache.solr:solr-solrj</include> </includes> <unpack>false</unpack> </dependencySet> @@ -223,7 +224,6 @@ <outputDirectory>/ews/webapp/WEB-INF/classes/lib</outputDirectory> </binaries> <includes> - <include>org.apache.ranger:ranger_solrj</include> <include>org.apache.ranger:ranger-plugins-audit</include> <include>org.apache.ranger:ranger-plugins-cred</include> <include>org.apache.ranger:ranger-plugins-common</include> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/586753d8/src/main/assembly/knox-agent.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/knox-agent.xml b/src/main/assembly/knox-agent.xml index 3352153..1b13078 100644 --- a/src/main/assembly/knox-agent.xml +++ b/src/main/assembly/knox-agent.xml @@ -61,6 +61,7 @@ <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> </includes> <unpack>false</unpack> </dependencySet> @@ -68,7 +69,6 @@ <outputDirectory>/lib/ranger-knox-plugin-impl</outputDirectory> </binaries> <includes> - <include>org.apache.ranger:ranger_solrj</include> <include>org.apache.ranger:ranger-plugins-audit</include> <include>org.apache.ranger:ranger-plugins-cred</include> <include>org.apache.ranger:ranger-plugins-common</include> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/586753d8/src/main/assembly/plugin-kafka.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/plugin-kafka.xml b/src/main/assembly/plugin-kafka.xml index 835cc15..4c65055 100644 --- a/src/main/assembly/plugin-kafka.xml +++ b/src/main/assembly/plugin-kafka.xml @@ -74,6 +74,7 @@ <include>org.codehaus.jackson:jackson-jaxrs</include> <include>org.codehaus.jackson:jackson-mapper-asl</include> <include>org.codehaus.jackson:jackson-xc</include> + <include>org.apache.solr:solr-solrj</include> </includes> </dependencySet> <dependencySet> @@ -107,7 +108,6 @@ </binaries> <includes> <include>org.apache.ranger:ranger-kafka-plugin</include> - <include>org.apache.ranger:ranger_solrj</include> <include>org.apache.ranger:ranger-plugins-audit</include> <include>org.apache.ranger:ranger-plugins-cred</include> <include>org.apache.ranger:ranger-plugins-common</include> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/586753d8/src/main/assembly/plugin-kms.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/plugin-kms.xml b/src/main/assembly/plugin-kms.xml index 84b180d..a0ac51f 100755 --- a/src/main/assembly/plugin-kms.xml +++ b/src/main/assembly/plugin-kms.xml @@ -48,6 +48,7 @@ <include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include> <include>org.noggit:noggit:jar:${noggit.version}</include> <include>org.apache.zookeeper:zookeeper:jar:${zookeeper.version}</include> + <include>org.apache.solr:solr-solrj</include> </includes> </dependencySet> <dependencySet> @@ -74,7 +75,6 @@ <outputDirectory>/lib</outputDirectory> </binaries> <includes> - <include>org.apache.ranger:ranger_solrj</include> <include>org.apache.ranger:ranger-plugins-audit</include> <include>org.apache.ranger:ranger-plugins-cred</include> <include>org.apache.ranger:ranger-plugins-common</include> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/586753d8/src/main/assembly/plugin-yarn.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/plugin-yarn.xml b/src/main/assembly/plugin-yarn.xml index d28834b..93176a1 100644 --- a/src/main/assembly/plugin-yarn.xml +++ b/src/main/assembly/plugin-yarn.xml @@ -55,6 +55,7 @@ <include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include> <include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include> <include>org.noggit:noggit:jar:${noggit.version}</include> + <include>org.apache.solr:solr-solrj</include> </includes> </dependencySet> <dependencySet> @@ -81,7 +82,6 @@ <outputDirectory>/lib/ranger-yarn-plugin-impl</outputDirectory> </binaries> <includes> - <include>org.apache.ranger:ranger_solrj</include> <include>org.apache.ranger:ranger-plugins-audit</include> <include>org.apache.ranger:ranger-plugins-cred</include> <include>org.apache.ranger:ranger-plugins-common</include> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/586753d8/src/main/assembly/storm-agent.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/storm-agent.xml b/src/main/assembly/storm-agent.xml index f4f63da..a9f7387 100644 --- a/src/main/assembly/storm-agent.xml +++ b/src/main/assembly/storm-agent.xml @@ -71,6 +71,7 @@ <include>commons-cli:commons-cli:jar:${commons.cli.version}</include> <include>commons-lang:commons-lang:jar:${commons.lang.version}</include> <include>commons-io:commons-io:jar:${commons.io.version}</include> + <include>org.apache.solr:solr-solrj</include> </includes> </dependencySet> <dependencySet> @@ -97,7 +98,6 @@ <outputDirectory>lib/ranger-storm-plugin-impl</outputDirectory> </binaries> <includes> - <include>org.apache.ranger:ranger_solrj</include> <include>org.apache.ranger:ranger-plugins-audit</include> <include>org.apache.ranger:ranger-plugins-cred</include> <include>org.apache.ranger:ranger-plugins-common</include>
