RANGER-825 groupId in ranger's child poms should be consistent and follow convention.
Signed-off-by: Alok Lal <[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/0545652a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/0545652a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/0545652a Branch: refs/heads/HDP-2.3.2-groupid Commit: 0545652acb8cbdf00a2e0ee5713302063b7aba1d Parents: d3a3c01 Author: Alok Lal <[email protected]> Authored: Wed Jan 27 18:27:12 2016 -0800 Committer: Alok Lal <[email protected]> Committed: Mon Feb 8 16:22:46 2016 -0800 ---------------------------------------------------------------------- agents-audit/pom.xml | 3 +-- agents-common/pom.xml | 3 +-- agents-cred/pom.xml | 1 - agents-installer/pom.xml | 1 - credentialbuilder/pom.xml | 1 - embeddedwebserver/pom.xml | 1 - hbase-agent/pom.xml | 5 ++--- hdfs-agent/pom.xml | 5 ++--- hive-agent/pom.xml | 5 ++--- jisql/pom.xml | 1 - kms/pom.xml | 1 + knox-agent/pom.xml | 5 ++--- plugin-kafka/pom.xml | 5 ++--- plugin-kms/pom.xml | 5 ++--- plugin-solr/pom.xml | 5 ++--- plugin-yarn/pom.xml | 5 ++--- ranger_solrj/pom.xml | 2 +- security-admin/pom.xml | 2 +- src/main/assembly/admin-web.xml | 22 +++++++++++----------- src/main/assembly/hbase-agent.xml | 11 +++++------ src/main/assembly/hdfs-agent.xml | 14 +++++++------- src/main/assembly/hive-agent.xml | 11 +++++------ src/main/assembly/kms.xml | 13 ++++++------- src/main/assembly/knox-agent.xml | 11 +++++------ src/main/assembly/plugin-kafka.xml | 14 ++++++-------- src/main/assembly/plugin-kms.xml | 13 ++++++------- src/main/assembly/plugin-solr.xml | 16 +++++++--------- src/main/assembly/plugin-yarn.xml | 13 ++++++------- src/main/assembly/storm-agent.xml | 13 ++++++------- src/main/assembly/usersync.xml | 2 +- storm-agent/pom.xml | 5 ++--- 31 files changed, 94 insertions(+), 120 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0545652a/agents-audit/pom.xml ---------------------------------------------------------------------- diff --git a/agents-audit/pom.xml b/agents-audit/pom.xml index 498dfd8..0b6abfb 100644 --- a/agents-audit/pom.xml +++ b/agents-audit/pom.xml @@ -17,7 +17,6 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>security_plugins.ranger-plugins-audit</groupId> <artifactId>ranger-plugins-audit</artifactId> <name>Audit Component</name> <description>Auth Audit</description> @@ -33,7 +32,7 @@ </parent> <dependencies> <dependency> - <groupId>security_plugins.ranger-plugins-cred</groupId> + <groupId>org.apache.ranger</groupId> <artifactId>ranger-plugins-cred</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0545652a/agents-common/pom.xml ---------------------------------------------------------------------- diff --git a/agents-common/pom.xml b/agents-common/pom.xml index 8acdf80..293aaec 100644 --- a/agents-common/pom.xml +++ b/agents-common/pom.xml @@ -17,7 +17,6 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>security_plugins.ranger-plugins-common</groupId> <artifactId>ranger-plugins-common</artifactId> <name>Common library for Plugins</name> <description>Plugins Common</description> @@ -66,7 +65,7 @@ <version>${codehaus.jackson.version}</version> </dependency> <dependency> - <groupId>security_plugins.ranger-plugins-audit</groupId> + <groupId>org.apache.ranger</groupId> <artifactId>ranger-plugins-audit</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0545652a/agents-cred/pom.xml ---------------------------------------------------------------------- diff --git a/agents-cred/pom.xml b/agents-cred/pom.xml index 2063187..0fd569c 100644 --- a/agents-cred/pom.xml +++ b/agents-cred/pom.xml @@ -17,7 +17,6 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>security_plugins.ranger-plugins-cred</groupId> <artifactId>ranger-plugins-cred</artifactId> <name>Credential Support</name> <description>Plugins Common</description> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0545652a/agents-installer/pom.xml ---------------------------------------------------------------------- diff --git a/agents-installer/pom.xml b/agents-installer/pom.xml index 633da6d..a50978e 100644 --- a/agents-installer/pom.xml +++ b/agents-installer/pom.xml @@ -17,7 +17,6 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>security_plugins.ranger-plugins-installer</groupId> <artifactId>ranger-plugins-installer</artifactId> <name>Installer Support Component</name> <description>Security Plugins Installer</description> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0545652a/credentialbuilder/pom.xml ---------------------------------------------------------------------- diff --git a/credentialbuilder/pom.xml b/credentialbuilder/pom.xml index b4f9c10..c092620 100644 --- a/credentialbuilder/pom.xml +++ b/credentialbuilder/pom.xml @@ -18,7 +18,6 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <artifactId>credentialbuilder</artifactId> - <version>0.5.0</version> <name>Credential Builder</name> <description>Credential Builder for non-hadoop java codebase</description> <packaging>jar</packaging> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0545652a/embeddedwebserver/pom.xml ---------------------------------------------------------------------- diff --git a/embeddedwebserver/pom.xml b/embeddedwebserver/pom.xml index 40e482d..191dc1a 100644 --- a/embeddedwebserver/pom.xml +++ b/embeddedwebserver/pom.xml @@ -18,7 +18,6 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <artifactId>embeddedwebserver</artifactId> - <version>0.5.0</version> <name>Embedded Web Server Invoker</name> <description>Embedded Web Server Invoker</description> <packaging>jar</packaging> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0545652a/hbase-agent/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-agent/pom.xml b/hbase-agent/pom.xml index b4664f3..161cf62 100644 --- a/hbase-agent/pom.xml +++ b/hbase-agent/pom.xml @@ -17,7 +17,6 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>security_plugins.ranger-hbase-plugin</groupId> <artifactId>ranger-hbase-plugin</artifactId> <name>HBase Security Plugin</name> <description>HBase Security Plugins</description> @@ -43,12 +42,12 @@ <version>${hadoop.version}</version> </dependency> <dependency> - <groupId>security_plugins.ranger-plugins-common</groupId> + <groupId>org.apache.ranger</groupId> <artifactId>ranger-plugins-common</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>security_plugins.ranger-plugins-audit</groupId> + <groupId>org.apache.ranger</groupId> <artifactId>ranger-plugins-audit</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0545652a/hdfs-agent/pom.xml ---------------------------------------------------------------------- diff --git a/hdfs-agent/pom.xml b/hdfs-agent/pom.xml index d1f42a7..17a6692 100644 --- a/hdfs-agent/pom.xml +++ b/hdfs-agent/pom.xml @@ -17,7 +17,6 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>security_plugins.ranger-hdfs-plugin</groupId> <artifactId>ranger-hdfs-plugin</artifactId> <name>Hdfs Security Plugin</name> <description>Hdfs Security Plugins</description> @@ -111,12 +110,12 @@ <version>${javassist.version}</version> </dependency> <dependency> - <groupId>security_plugins.ranger-plugins-audit</groupId> + <groupId>org.apache.ranger</groupId> <artifactId>ranger-plugins-audit</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>security_plugins.ranger-plugins-common</groupId> + <groupId>org.apache.ranger</groupId> <artifactId>ranger-plugins-common</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0545652a/hive-agent/pom.xml ---------------------------------------------------------------------- diff --git a/hive-agent/pom.xml b/hive-agent/pom.xml index 2f2e7f8..cd9e632 100644 --- a/hive-agent/pom.xml +++ b/hive-agent/pom.xml @@ -17,7 +17,6 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>security_plugins.ranger-hive-plugin</groupId> <artifactId>ranger-hive-plugin</artifactId> <name>Hive Security Plugin</name> <description>Hive Security Plugins</description> @@ -113,12 +112,12 @@ <version>${hadoop.version}</version> </dependency> <dependency> - <groupId>security_plugins.ranger-plugins-common</groupId> + <groupId>org.apache.ranger</groupId> <artifactId>ranger-plugins-common</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>security_plugins.ranger-plugins-audit</groupId> + <groupId>org.apache.ranger</groupId> <artifactId>ranger-plugins-audit</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0545652a/jisql/pom.xml ---------------------------------------------------------------------- diff --git a/jisql/pom.xml b/jisql/pom.xml index 9b7e056..1aeed03 100644 --- a/jisql/pom.xml +++ b/jisql/pom.xml @@ -18,7 +18,6 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <artifactId>jisql</artifactId> - <version>0.1.0</version> <name>Jdbc SQL Connector</name> <description>Jdbc SQL Connector to execute sql statement in any db</description> <packaging>jar</packaging> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0545652a/kms/pom.xml ---------------------------------------------------------------------- diff --git a/kms/pom.xml b/kms/pom.xml index b89837d..9519576 100644 --- a/kms/pom.xml +++ b/kms/pom.xml @@ -25,6 +25,7 @@ <groupId>org.apache.ranger</groupId> <artifactId>ranger</artifactId> <version>0.5.0</version> + <relativePath>..</relativePath> </parent> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0545652a/knox-agent/pom.xml ---------------------------------------------------------------------- diff --git a/knox-agent/pom.xml b/knox-agent/pom.xml index 9e85527..9cfcb74 100644 --- a/knox-agent/pom.xml +++ b/knox-agent/pom.xml @@ -17,7 +17,6 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>security_plugins.ranger-knox-plugin</groupId> <artifactId>ranger-knox-plugin</artifactId> <name>Knox Security Plugin</name> <description>Knox Security Plugins</description> @@ -74,7 +73,7 @@ <version>${codehaus.jackson.version}</version> </dependency> <dependency> - <groupId>security_plugins.ranger-plugins-common</groupId> + <groupId>org.apache.ranger</groupId> <artifactId>ranger-plugins-common</artifactId> <version>${project.version}</version> <!-- TO DEBUG JERSEY2 code: uncomment this exclusion @@ -82,7 +81,7 @@ --> </dependency> <dependency> - <groupId>security_plugins.ranger-plugins-audit</groupId> + <groupId>org.apache.ranger</groupId> <artifactId>ranger-plugins-audit</artifactId> <version>${project.version}</version> <!-- TO DEBUG JERSEY2 code: uncomment this exclusion http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0545652a/plugin-kafka/pom.xml ---------------------------------------------------------------------- diff --git a/plugin-kafka/pom.xml b/plugin-kafka/pom.xml index afee47d..bd438a5 100644 --- a/plugin-kafka/pom.xml +++ b/plugin-kafka/pom.xml @@ -12,7 +12,6 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>security_plugins.ranger-kafka-plugin</groupId> <artifactId>ranger-kafka-plugin</artifactId> <name>KAFKA Security Plugin</name> <description>KAFKA Security Plugin</description> @@ -28,12 +27,12 @@ </parent> <dependencies> <dependency> - <groupId>security_plugins.ranger-plugins-common</groupId> + <groupId>org.apache.ranger</groupId> <artifactId>ranger-plugins-common</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>security_plugins.ranger-plugins-audit</groupId> + <groupId>org.apache.ranger</groupId> <artifactId>ranger-plugins-audit</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0545652a/plugin-kms/pom.xml ---------------------------------------------------------------------- diff --git a/plugin-kms/pom.xml b/plugin-kms/pom.xml index ddfde79..344abe3 100755 --- a/plugin-kms/pom.xml +++ b/plugin-kms/pom.xml @@ -17,7 +17,6 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>security_plugins.ranger-kms-plugin</groupId> <artifactId>ranger-kms-plugin</artifactId> <name>KMS Security Plugin</name> <description>KMS Security Plugin</description> @@ -33,12 +32,12 @@ </parent> <dependencies> <dependency> - <groupId>security_plugins.ranger-plugins-common</groupId> + <groupId>org.apache.ranger</groupId> <artifactId>ranger-plugins-common</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>security_plugins.ranger-plugins-audit</groupId> + <groupId>org.apache.ranger</groupId> <artifactId>ranger-plugins-audit</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0545652a/plugin-solr/pom.xml ---------------------------------------------------------------------- diff --git a/plugin-solr/pom.xml b/plugin-solr/pom.xml index 922aa47..22a0697 100644 --- a/plugin-solr/pom.xml +++ b/plugin-solr/pom.xml @@ -12,7 +12,6 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>security_plugins.ranger-solr-plugin</groupId> <artifactId>ranger-solr-plugin</artifactId> <name>SOLR Security Plugin</name> <description>SOLR Security Plugin</description> @@ -28,12 +27,12 @@ </parent> <dependencies> <dependency> - <groupId>security_plugins.ranger-plugins-common</groupId> + <groupId>org.apache.ranger</groupId> <artifactId>ranger-plugins-common</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>security_plugins.ranger-plugins-audit</groupId> + <groupId>org.apache.ranger</groupId> <artifactId>ranger-plugins-audit</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0545652a/plugin-yarn/pom.xml ---------------------------------------------------------------------- diff --git a/plugin-yarn/pom.xml b/plugin-yarn/pom.xml index b6fb379..85cccd0 100644 --- a/plugin-yarn/pom.xml +++ b/plugin-yarn/pom.xml @@ -17,7 +17,6 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>security_plugins.ranger-yarn-plugin</groupId> <artifactId>ranger-yarn-plugin</artifactId> <name>YARN Security Plugin</name> <description>YARN Security Plugin</description> @@ -33,12 +32,12 @@ </parent> <dependencies> <dependency> - <groupId>security_plugins.ranger-plugins-common</groupId> + <groupId>org.apache.ranger</groupId> <artifactId>ranger-plugins-common</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>security_plugins.ranger-plugins-audit</groupId> + <groupId>org.apache.ranger</groupId> <artifactId>ranger-plugins-audit</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0545652a/ranger_solrj/pom.xml ---------------------------------------------------------------------- diff --git a/ranger_solrj/pom.xml b/ranger_solrj/pom.xml index c1b5985..d031fb4 100644 --- a/ranger_solrj/pom.xml +++ b/ranger_solrj/pom.xml @@ -23,9 +23,9 @@ <groupId>org.apache.ranger</groupId> <artifactId>ranger</artifactId> <version>0.5.0</version> + <relativePath>..</relativePath> </parent> <artifactId>ranger_solrj</artifactId> - <version>0.5.0</version> <name>ranger_solrj</name> <url>http://maven.apache.org</url> <properties> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0545652a/security-admin/pom.xml ---------------------------------------------------------------------- diff --git a/security-admin/pom.xml b/security-admin/pom.xml index 3c26837..4b7c10d 100644 --- a/security-admin/pom.xml +++ b/security-admin/pom.xml @@ -398,7 +398,7 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>security_plugins.ranger-plugins-common</groupId> + <groupId>org.apache.ranger</groupId> <artifactId>ranger-plugins-common</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0545652a/src/main/assembly/admin-web.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/admin-web.xml b/src/main/assembly/admin-web.xml index 4f34ef6..26156c3 100644 --- a/src/main/assembly/admin-web.xml +++ b/src/main/assembly/admin-web.xml @@ -56,7 +56,7 @@ <fileMode>644</fileMode> </binaries> <includes> - <include>security_plugins.ranger-hdfs-plugin:ranger-hdfs-plugin</include> + <include>org.apache.ranger:ranger-hdfs-plugin</include> </includes> </moduleSet> @@ -81,7 +81,7 @@ </dependencySets> </binaries> <includes> - <include>security_plugins.ranger-hive-plugin:ranger-hive-plugin</include> + <include>org.apache.ranger:ranger-hive-plugin</include> </includes> </moduleSet> @@ -106,7 +106,7 @@ </dependencySets> </binaries> <includes> - <include>security_plugins.ranger-hbase-plugin:ranger-hbase-plugin</include> + <include>org.apache.ranger:ranger-hbase-plugin</include> </includes> </moduleSet> @@ -129,7 +129,7 @@ </dependencySets> </binaries> <includes> - <include>security_plugins.ranger-knox-plugin:ranger-knox-plugin</include> + <include>org.apache.ranger:ranger-knox-plugin</include> </includes> </moduleSet> @@ -149,7 +149,7 @@ </dependencySets> </binaries> <includes> - <include>security_plugins.ranger-storm-plugin:ranger-storm-plugin</include> + <include>org.apache.ranger:ranger-storm-plugin</include> </includes> </moduleSet> @@ -170,7 +170,7 @@ </dependencySets> </binaries> <includes> - <include>security_plugins.ranger-yarn-plugin:ranger-yarn-plugin</include> + <include>org.apache.ranger:ranger-yarn-plugin</include> </includes> </moduleSet> @@ -183,7 +183,7 @@ <fileMode>644</fileMode> </binaries> <includes> - <include>security_plugins.ranger-kms-plugin:ranger-kms-plugin</include> + <include>org.apache.ranger:ranger-kms-plugin</include> </includes> </moduleSet> @@ -276,7 +276,7 @@ <fileMode>644</fileMode> </binaries> <includes> - <include>security_plugins.ranger-kafka-plugin:ranger-kafka-plugin</include> + <include>org.apache.ranger:ranger-kafka-plugin</include> </includes> </moduleSet> @@ -289,7 +289,7 @@ <fileMode>644</fileMode> </binaries> <includes> - <include>security_plugins.ranger-solr-plugin:ranger-solr-plugin</include> + <include>org.apache.ranger:ranger-solr-plugin</include> </includes> </moduleSet> </moduleSets> @@ -308,7 +308,7 @@ <fileMode>644</fileMode> </binaries> <includes> - <include>security_plugins.ranger-kafka-plugin:ranger-kafka-plugin</include> + <include>org.apache.ranger:ranger-kafka-plugin</include> </includes> </moduleSet> </moduleSets> @@ -325,7 +325,7 @@ <fileMode>644</fileMode> </binaries> <includes> - <include>security_plugins.ranger-solr-plugin:ranger-solr-plugin</include> + <include>org.apache.ranger:ranger-solr-plugin</include> </includes> </moduleSet> </moduleSets> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0545652a/src/main/assembly/hbase-agent.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/hbase-agent.xml b/src/main/assembly/hbase-agent.xml index 0f22066..e4c2391 100644 --- a/src/main/assembly/hbase-agent.xml +++ b/src/main/assembly/hbase-agent.xml @@ -46,11 +46,10 @@ </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> - <include>security_plugins.ranger-plugins-common:ranger-plugins-common</include> - <include>security_plugins.ranger-hbase-plugin:ranger-hbase-plugin</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> + <include>org.apache.ranger:ranger-hbase-plugin</include> </includes> </moduleSet> <moduleSet> @@ -80,7 +79,7 @@ <unpack>false</unpack> </binaries> <includes> - <include>security_plugins.ranger-plugins-installer:ranger-plugins-installer</include> + <include>org.apache.ranger:ranger-plugins-installer</include> <include>org.apache.ranger:credentialbuilder</include> </includes> </moduleSet> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0545652a/src/main/assembly/hdfs-agent.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/hdfs-agent.xml b/src/main/assembly/hdfs-agent.xml index 2c18001..20586e6 100644 --- a/src/main/assembly/hdfs-agent.xml +++ b/src/main/assembly/hdfs-agent.xml @@ -47,11 +47,11 @@ </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> - <include>security_plugins.ranger-plugins-common:ranger-plugins-common</include> - <include>security_plugins.ranger-hdfs-plugin:ranger-hdfs-plugin</include> + <include>org.apache.ranger:ranger-plugins-audit</include> + <include>org.apache.ranger:ranger-plugins-cred</include> + <include>org.apache.ranger:ranger-plugins-impl</include> + <include>org.apache.ranger:ranger-plugins-common</include> + <include>org.apache.ranger:ranger-hdfs-plugin</include> </includes> </moduleSet> <moduleSet> @@ -81,11 +81,11 @@ <unpack>false</unpack> </binaries> <includes> - <include>security_plugins.ranger-plugins-installer:ranger-plugins-installer</include> + <include>org.apache.ranger:ranger-plugins-installer</include> <include>org.apache.ranger:credentialbuilder</include> </includes> </moduleSet> - </moduleSets> + </moduleSets> <fileSets> <!-- conf.templates for enable --> <fileSet> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0545652a/src/main/assembly/hive-agent.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/hive-agent.xml b/src/main/assembly/hive-agent.xml index d21c6b8..46cefcc 100644 --- a/src/main/assembly/hive-agent.xml +++ b/src/main/assembly/hive-agent.xml @@ -47,11 +47,10 @@ </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> - <include>security_plugins.ranger-plugins-common:ranger-plugins-common</include> - <include>security_plugins.ranger-hive-plugin:ranger-hive-plugin</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> + <include>org.apache.ranger:ranger-hive-plugin</include> </includes> </moduleSet> <moduleSet> @@ -81,7 +80,7 @@ <unpack>false</unpack> </binaries> <includes> - <include>security_plugins.ranger-plugins-installer:ranger-plugins-installer</include> + <include>org.apache.ranger:ranger-plugins-installer</include> <include>org.apache.ranger:credentialbuilder</include> </includes> </moduleSet> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0545652a/src/main/assembly/kms.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/kms.xml b/src/main/assembly/kms.xml index 52ab5a0..ce59846 100755 --- a/src/main/assembly/kms.xml +++ b/src/main/assembly/kms.xml @@ -216,7 +216,7 @@ <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include> <include>org.apache.hadoop:hadoop-common:jar:${hadoop-common.version}</include> <include>org.apache.hadoop:hadoop-auth:jar:${hadoop-common.version}</include> - <include>security_plugins.ranger-plugins-cred:ranger-plugins-cred</include> + <include>org.apache.ranger:ranger-plugins-cred</include> <include>org.apache.ranger:credentialbuilder</include> </includes> </dependencySet> @@ -225,11 +225,10 @@ </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> - <include>security_plugins.ranger-plugins-common:ranger-plugins-common</include> - <include>security_plugins.ranger-kms-plugin:ranger-kms-plugin</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> + <include>org.apache.ranger:ranger-kms-plugin</include> <include>org.apache.ranger:credentialbuilder</include> </includes> </moduleSet> @@ -240,7 +239,7 @@ <unpack>false</unpack> </binaries> <includes> - <include>security_plugins.ranger-plugins-installer:ranger-plugins-installer</include> + <include>org.apache.ranger:ranger-plugins-installer</include> <include>org.apache.ranger:credentialbuilder</include> </includes> </moduleSet> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0545652a/src/main/assembly/knox-agent.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/knox-agent.xml b/src/main/assembly/knox-agent.xml index 7c08270..3298f0e 100644 --- a/src/main/assembly/knox-agent.xml +++ b/src/main/assembly/knox-agent.xml @@ -48,11 +48,10 @@ </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> - <include>security_plugins.ranger-plugins-common:ranger-plugins-common</include> - <include>security_plugins.ranger-knox-plugin:ranger-knox-plugin</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> + <include>org.apache.ranger:ranger-knox-plugin</include> </includes> </moduleSet> <moduleSet> @@ -82,7 +81,7 @@ </dependencySets> </binaries> <includes> - <include>security_plugins.ranger-plugins-installer:ranger-plugins-installer</include> + <include>org.apache.ranger:ranger-plugins-installer</include> <include>org.apache.ranger:credentialbuilder</include> </includes> </moduleSet> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0545652a/src/main/assembly/plugin-kafka.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/plugin-kafka.xml b/src/main/assembly/plugin-kafka.xml index 3727bde..28e50f6 100644 --- a/src/main/assembly/plugin-kafka.xml +++ b/src/main/assembly/plugin-kafka.xml @@ -85,7 +85,7 @@ </include> <include>org.apache.hadoop:hadoop-auth:jar:${hadoop-common.version} </include> - <include>security_plugins.ranger-plugins-cred:ranger-plugins-cred + <include>org.apache.ranger:ranger-plugins-cred </include> <include>org.apache.ranger:credentialbuilder</include> </includes> @@ -95,15 +95,13 @@ </binaries> <includes> <include>org.apache.ranger:ranger_solrj</include> - <include>security_plugins.ranger-plugins-audit:ranger-plugins-audit + <include>org.apache.ranger:ranger-plugins-audit </include> - <include>security_plugins.ranger-plugins-cred:ranger-plugins-cred + <include>org.apache.ranger:ranger-plugins-cred </include> - <include>security_plugins.ranger-plugins-impl:ranger-plugins-impl + <include>org.apache.ranger:ranger-plugins-common </include> - <include>security_plugins.ranger-plugins-common:ranger-plugins-common - </include> - <include>security_plugins.ranger-kafka-plugin:ranger-kafka-plugin + <include>org.apache.ranger:ranger-kafka-plugin </include> </includes> </moduleSet> @@ -114,7 +112,7 @@ <unpack>false</unpack> </binaries> <includes> - <include>security_plugins.ranger-plugins-installer:ranger-plugins-installer + <include>org.apache.ranger:ranger-plugins-installer </include> <include>org.apache.ranger:credentialbuilder</include> </includes> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0545652a/src/main/assembly/plugin-kms.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/plugin-kms.xml b/src/main/assembly/plugin-kms.xml index fc2670b..d3e79b6 100755 --- a/src/main/assembly/plugin-kms.xml +++ b/src/main/assembly/plugin-kms.xml @@ -68,7 +68,7 @@ <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include> <include>org.apache.hadoop:hadoop-common:jar:${hadoop-common.version}</include> <include>org.apache.hadoop:hadoop-auth:jar:${hadoop-common.version}</include> - <include>security_plugins.ranger-plugins-cred:ranger-plugins-cred</include> + <include>org.apache.ranger:ranger-plugins-cred</include> <include>org.apache.ranger:credentialbuilder</include> </includes> </dependencySet> @@ -77,11 +77,10 @@ </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> - <include>security_plugins.ranger-plugins-common:ranger-plugins-common</include> - <include>security_plugins.ranger-kms-plugin:ranger-kms-plugin</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> + <include>org.apache.ranger:ranger-kms-plugin</include> </includes> </moduleSet> <moduleSet> @@ -91,7 +90,7 @@ <unpack>false</unpack> </binaries> <includes> - <include>security_plugins.ranger-plugins-installer:ranger-plugins-installer</include> + <include>org.apache.ranger:ranger-plugins-installer</include> <include>org.apache.ranger:credentialbuilder</include> </includes> </moduleSet> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0545652a/src/main/assembly/plugin-solr.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/plugin-solr.xml b/src/main/assembly/plugin-solr.xml index 5276cc4..31ebd6b 100644 --- a/src/main/assembly/plugin-solr.xml +++ b/src/main/assembly/plugin-solr.xml @@ -65,10 +65,10 @@ </include> <include>org.apache.hadoop:hadoop-auth:jar:${hadoop-common.version} </include> - <include>security_plugins.ranger-plugins-cred:ranger-plugins-cred + <include>org.apache.ranger:ranger-plugins-cred </include> <include>org.apache.ranger:credentialbuilder</include> - <include>security_plugins.ranger-solr-plugin:ranger-solr-plugin + <include>org.apache.ranger:ranger-solr-plugin </include> </includes> @@ -77,15 +77,13 @@ <outputDirectory>/lib</outputDirectory> </binaries> <includes> - <include>security_plugins.ranger-plugins-audit:ranger-plugins-audit + <include>org.apache.ranger:ranger-plugins-audit </include> - <include>security_plugins.ranger-plugins-cred:ranger-plugins-cred + <include>org.apache.ranger:ranger-plugins-cred </include> - <include>security_plugins.ranger-plugins-impl:ranger-plugins-impl + <include>org.apache.ranger:ranger-plugins-common </include> - <include>security_plugins.ranger-plugins-common:ranger-plugins-common - </include> - <include>security_plugins.ranger-solr-plugin:ranger-solr-plugin + <include>org.apache.ranger:ranger-solr-plugin </include> </includes> </moduleSet> @@ -96,7 +94,7 @@ <unpack>false</unpack> </binaries> <includes> - <include>security_plugins.ranger-plugins-installer:ranger-plugins-installer + <include>org.apache.ranger:ranger-plugins-installer </include> <include>org.apache.ranger:credentialbuilder</include> </includes> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0545652a/src/main/assembly/plugin-yarn.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/plugin-yarn.xml b/src/main/assembly/plugin-yarn.xml index a791bba..fb1a353 100644 --- a/src/main/assembly/plugin-yarn.xml +++ b/src/main/assembly/plugin-yarn.xml @@ -61,7 +61,7 @@ <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include> <include>org.apache.hadoop:hadoop-common:jar:${hadoop-common.version}</include> <include>org.apache.hadoop:hadoop-auth:jar:${hadoop-common.version}</include> - <include>security_plugins.ranger-plugins-cred:ranger-plugins-cred</include> + <include>org.apache.ranger:ranger-plugins-cred</include> <include>org.apache.ranger:credentialbuilder</include> </includes> </dependencySet> @@ -70,11 +70,10 @@ </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> - <include>security_plugins.ranger-plugins-common:ranger-plugins-common</include> - <include>security_plugins.ranger-yarn-plugin:ranger-yarn-plugin</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> + <include>org.apache.ranger:ranger-yarn-plugin</include> </includes> </moduleSet> <moduleSet> @@ -84,7 +83,7 @@ <unpack>false</unpack> </binaries> <includes> - <include>security_plugins.ranger-plugins-installer:ranger-plugins-installer</include> + <include>org.apache.ranger:ranger-plugins-installer</include> <include>org.apache.ranger:credentialbuilder</include> </includes> </moduleSet> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0545652a/src/main/assembly/storm-agent.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/storm-agent.xml b/src/main/assembly/storm-agent.xml index 12ec052..0b01082 100644 --- a/src/main/assembly/storm-agent.xml +++ b/src/main/assembly/storm-agent.xml @@ -78,7 +78,7 @@ <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include> <include>org.apache.hadoop:hadoop-common:jar:${hadoop-common.version}</include> <include>org.apache.hadoop:hadoop-auth:jar:${hadoop-common.version}</include> - <include>security_plugins.ranger-plugins-cred:ranger-plugins-cred</include> + <include>org.apache.ranger:ranger-plugins-cred</include> <include>org.apache.ranger:credentialbuilder</include> </includes> </dependencySet> @@ -87,11 +87,10 @@ </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> - <include>security_plugins.ranger-plugins-common:ranger-plugins-common</include> - <include>security_plugins.ranger-storm-plugin:ranger-storm-plugin</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> + <include>org.apache.ranger:ranger-storm-plugin</include> </includes> </moduleSet> <moduleSet> @@ -101,7 +100,7 @@ <unpack>false</unpack> </binaries> <includes> - <include>security_plugins.ranger-plugins-installer:ranger-plugins-installer</include> + <include>org.apache.ranger:ranger-plugins-installer</include> <include>org.apache.ranger:credentialbuilder</include> </includes> </moduleSet> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0545652a/src/main/assembly/usersync.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/usersync.xml b/src/main/assembly/usersync.xml index a4bc87c..1237401 100644 --- a/src/main/assembly/usersync.xml +++ b/src/main/assembly/usersync.xml @@ -69,7 +69,7 @@ <unpack>false</unpack> </binaries> <includes> - <include>security_plugins.ranger-plugins-installer:ranger-plugins-installer</include> + <include>org.apache.ranger:ranger-plugins-installer</include> </includes> </moduleSet> </moduleSets> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0545652a/storm-agent/pom.xml ---------------------------------------------------------------------- diff --git a/storm-agent/pom.xml b/storm-agent/pom.xml index 5fd0aa3..f99350b 100644 --- a/storm-agent/pom.xml +++ b/storm-agent/pom.xml @@ -17,7 +17,6 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>security_plugins.ranger-storm-plugin</groupId> <artifactId>ranger-storm-plugin</artifactId> <name>Storm Security Plugin</name> <description>Storm Security Plugins</description> @@ -38,12 +37,12 @@ <version>${storm.version}</version> </dependency> <dependency> - <groupId>security_plugins.ranger-plugins-common</groupId> + <groupId>org.apache.ranger</groupId> <artifactId>ranger-plugins-common</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>security_plugins.ranger-plugins-audit</groupId> + <groupId>org.apache.ranger</groupId> <artifactId>ranger-plugins-audit</artifactId> <version>${project.version}</version> </dependency>
