Repository: incubator-ranger Updated Branches: refs/heads/master 82f714208 -> c530e2c6c
RANGER-266: updated project version dependency for ranger_solrj Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/c530e2c6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/c530e2c6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/c530e2c6 Branch: refs/heads/master Commit: c530e2c6cb05cc1268650686c8ae5f01c94482fb Parents: 82f7142 Author: Madhan Neethiraj <[email protected]> Authored: Wed Mar 18 11:45:58 2015 -0700 Committer: Madhan Neethiraj <[email protected]> Committed: Wed Mar 18 11:45:58 2015 -0700 ---------------------------------------------------------------------- agents-audit/pom.xml | 2 +- security-admin/pom.xml | 2 +- src/main/assembly/hbase-agent.xml | 2 +- src/main/assembly/hdfs-agent.xml | 2 +- src/main/assembly/hive-agent.xml | 2 +- src/main/assembly/knox-agent.xml | 2 +- src/main/assembly/plugin-yarn.xml | 6 ++++++ src/main/assembly/storm-agent.xml | 2 +- 8 files changed, 13 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/c530e2c6/agents-audit/pom.xml ---------------------------------------------------------------------- diff --git a/agents-audit/pom.xml b/agents-audit/pom.xml index 6715575..3a2a4db 100644 --- a/agents-audit/pom.xml +++ b/agents-audit/pom.xml @@ -70,7 +70,7 @@ <dependency> <groupId>org.apache.ranger</groupId> <artifactId>ranger_solrj</artifactId> - <version>${ranger.solrj.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/c530e2c6/security-admin/pom.xml ---------------------------------------------------------------------- diff --git a/security-admin/pom.xml b/security-admin/pom.xml index e507afe..be581dc 100644 --- a/security-admin/pom.xml +++ b/security-admin/pom.xml @@ -246,7 +246,7 @@ <dependency> <groupId>org.apache.ranger</groupId> <artifactId>ranger_solrj</artifactId> - <version>${ranger.solrj.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/c530e2c6/src/main/assembly/hbase-agent.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/hbase-agent.xml b/src/main/assembly/hbase-agent.xml index 8dfbd5e..b87f6a0 100644 --- a/src/main/assembly/hbase-agent.xml +++ b/src/main/assembly/hbase-agent.xml @@ -36,7 +36,6 @@ <includes> <include>com.google.code.gson:gson*</include> <include>org.eclipse.persistence:eclipselink</include> - <include>org.apache.ranger:ranger_solrj:jar:${ranger.solrj.version}</include> <include>org.apache.httpcomponents:httpclient:jar:${httpcomponent.httpclient.version}</include> <include>org.apache.httpcomponents:httpcore:jar:${httpcomponent.httpcore.version}</include> <include>org.apache.httpcomponents:httpmime:jar:${httpcomponent.httpmime.version}</include> @@ -49,6 +48,7 @@ <outputDirectory>/lib</outputDirectory> </binaries> <includes> + <include>org.apache.ranger:ranger_solrj</include> <include>security_plugins.ranger-plugins-audit:ranger-plugins-audit</include> <include>security_plugins.ranger-plugins-cred:ranger-plugins-cred</include> <include>security_plugins.ranger-plugins-impl:ranger-plugins-impl</include> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/c530e2c6/src/main/assembly/hdfs-agent.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/hdfs-agent.xml b/src/main/assembly/hdfs-agent.xml index 27c2bf0..25b2116 100644 --- a/src/main/assembly/hdfs-agent.xml +++ b/src/main/assembly/hdfs-agent.xml @@ -37,7 +37,6 @@ <include>com.google.code.gson:gson*</include> <include>org.eclipse.persistence:javax.persistence</include> <include>org.eclipse.persistence:eclipselink</include> - <include>org.apache.ranger:ranger_solrj:jar:${ranger.solrj.version}</include> <include>org.apache.httpcomponents:httpclient:jar:${httpcomponent.httpclient.version}</include> <include>org.apache.httpcomponents:httpcore:jar:${httpcomponent.httpcore.version}</include> <include>org.apache.httpcomponents:httpmime:jar:${httpcomponent.httpmime.version}</include> @@ -50,6 +49,7 @@ <outputDirectory>/lib</outputDirectory> </binaries> <includes> + <include>org.apache.ranger:ranger_solrj</include> <include>security_plugins.ranger-plugins-audit:ranger-plugins-audit</include> <include>security_plugins.ranger-plugins-cred:ranger-plugins-cred</include> <include>security_plugins.ranger-plugins-impl:ranger-plugins-impl</include> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/c530e2c6/src/main/assembly/hive-agent.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/hive-agent.xml b/src/main/assembly/hive-agent.xml index f0bacb6..2f9287f 100644 --- a/src/main/assembly/hive-agent.xml +++ b/src/main/assembly/hive-agent.xml @@ -37,7 +37,6 @@ <include>com.google.code.gson:gson*</include> <include>org.eclipse.persistence:eclipselink</include> <include>org.eclipse.persistence:javax.persistence</include> - <include>org.apache.ranger:ranger_solrj:jar:${ranger.solrj.version}</include> <include>org.apache.httpcomponents:httpclient:jar:${httpcomponent.httpclient.version}</include> <include>org.apache.httpcomponents:httpcore:jar:${httpcomponent.httpcore.version}</include> <include>org.apache.httpcomponents:httpmime:jar:${httpcomponent.httpmime.version}</include> @@ -50,6 +49,7 @@ <outputDirectory>/lib</outputDirectory> </binaries> <includes> + <include>org.apache.ranger:ranger_solrj</include> <include>security_plugins.ranger-plugins-audit:ranger-plugins-audit</include> <include>security_plugins.ranger-plugins-cred:ranger-plugins-cred</include> <include>security_plugins.ranger-plugins-impl:ranger-plugins-impl</include> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/c530e2c6/src/main/assembly/knox-agent.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/knox-agent.xml b/src/main/assembly/knox-agent.xml index fe7000a..5874a5f 100644 --- a/src/main/assembly/knox-agent.xml +++ b/src/main/assembly/knox-agent.xml @@ -41,7 +41,6 @@ <include>com.google.code.gson:gson*</include> <include>org.eclipse.persistence:eclipselink</include> <include>org.eclipse.persistence:javax.persistence</include> - <include>org.apache.ranger:ranger_solrj:jar:${ranger.solrj.version}</include> <include>org.apache.httpcomponents:httpclient:jar:${httpcomponent.httpclient.version}</include> <include>org.apache.httpcomponents:httpcore:jar:${httpcomponent.httpcore.version}</include> <include>org.apache.httpcomponents:httpmime:jar:${httpcomponent.httpmime.version}</include> @@ -54,6 +53,7 @@ <outputDirectory>/lib</outputDirectory> </binaries> <includes> + <include>org.apache.ranger:ranger_solrj</include> <include>security_plugins.ranger-plugins-audit:ranger-plugins-audit</include> <include>security_plugins.ranger-plugins-cred:ranger-plugins-cred</include> <include>security_plugins.ranger-plugins-impl:ranger-plugins-impl</include> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/c530e2c6/src/main/assembly/plugin-yarn.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/plugin-yarn.xml b/src/main/assembly/plugin-yarn.xml index 9821888..21d74f7 100644 --- a/src/main/assembly/plugin-yarn.xml +++ b/src/main/assembly/plugin-yarn.xml @@ -45,6 +45,11 @@ <include>com.sun.jersey:jersey-bundle</include> <include>commons-logging:commons-logging:jar:${commons.logging.version}</include> <include>com.google.guava:guava:jar:${guava.version}</include> + <include>org.apache.httpcomponents:httpclient:jar:${httpcomponent.httpclient.version}</include> + <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>org.apache.zookeeper:zookeeper:jar:${zookeeper.version}</include> </includes> </dependencySet> <dependencySet> @@ -73,6 +78,7 @@ <outputDirectory>/lib</outputDirectory> </binaries> <includes> + <include>org.apache.ranger:ranger_solrj</include> <include>security_plugins.ranger-plugins-audit:ranger-plugins-audit</include> <include>security_plugins.ranger-plugins-cred:ranger-plugins-cred</include> <include>security_plugins.ranger-plugins-impl:ranger-plugins-impl</include> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/c530e2c6/src/main/assembly/storm-agent.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/storm-agent.xml b/src/main/assembly/storm-agent.xml index e76f50a..03bff8a 100644 --- a/src/main/assembly/storm-agent.xml +++ b/src/main/assembly/storm-agent.xml @@ -48,7 +48,6 @@ <include>org.codehaus.jackson:jackson-jaxrs:jar:${codehaus.jackson.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.ranger:ranger_solrj:jar:${ranger.solrj.version}</include> <include>org.apache.httpcomponents:httpclient:jar:${httpcomponent.httpclient.version}</include> <include>org.apache.httpcomponents:httpcore:jar:${httpcomponent.httpcore.version}</include> <include>org.apache.httpcomponents:httpmime:jar:${httpcomponent.httpmime.version}</include> @@ -82,6 +81,7 @@ <outputDirectory>/lib</outputDirectory> </binaries> <includes> + <include>org.apache.ranger:ranger_solrj</include> <include>security_plugins.ranger-plugins-audit:ranger-plugins-audit</include> <include>security_plugins.ranger-plugins-cred:ranger-plugins-cred</include> <include>security_plugins.ranger-plugins-impl:ranger-plugins-impl</include>
