diff --git a/authz-embedded/pom.xml b/authz-embedded/pom.xml
index 05377ee94c4..395affa765c 100644
--- a/authz-embedded/pom.xml
+++ b/authz-embedded/pom.xml
@@ -41,13 +41,7 @@
org.apache.ranger
- ranger-audit-dest-hdfs
- ${project.version}
-
-
-
- org.apache.ranger
- ranger-audit-dest-solr
+ ranger-audit-dest-auditserver
${project.version}
diff --git a/distro/pom.xml b/distro/pom.xml
index 962a67c70f2..3a1b38004a1 100644
--- a/distro/pom.xml
+++ b/distro/pom.xml
@@ -77,6 +77,12 @@
${project.version}
provided
+
+ org.apache.ranger
+ ranger-audit-dest-auditserver
+ ${project.version}
+ provided
+
org.apache.ranger
ranger-audit-dest-cloudwatch
diff --git a/distro/src/main/assembly/hbase-agent.xml b/distro/src/main/assembly/hbase-agent.xml
index be0703b0233..3da05e0fcbe 100644
--- a/distro/src/main/assembly/hbase-agent.xml
+++ b/distro/src/main/assembly/hbase-agent.xml
@@ -43,8 +43,6 @@
org.apache.ranger:ranger-audit-core
org.apache.ranger:ranger-audit-dest-auditserver
- org.apache.ranger:ranger-audit-dest-hdfs
- org.apache.ranger:ranger-audit-dest-solr
org.apache.ranger:ranger-authz-api
org.apache.ranger:ranger-common-utils
org.apache.ranger:ranger-plugins-cred
diff --git a/distro/src/main/assembly/hdfs-agent.xml b/distro/src/main/assembly/hdfs-agent.xml
index afad632e5d1..171181c80bd 100644
--- a/distro/src/main/assembly/hdfs-agent.xml
+++ b/distro/src/main/assembly/hdfs-agent.xml
@@ -72,8 +72,6 @@
org.apache.ranger:ranger-audit-core
org.apache.ranger:ranger-audit-dest-auditserver
- org.apache.ranger:ranger-audit-dest-hdfs
- org.apache.ranger:ranger-audit-dest-solr
org.apache.ranger:ranger-authz-api
org.apache.ranger:ranger-common-utils
org.apache.ranger:ranger-plugins-cred
diff --git a/distro/src/main/assembly/hive-agent.xml b/distro/src/main/assembly/hive-agent.xml
index c95e38ee3cf..90a5b161427 100644
--- a/distro/src/main/assembly/hive-agent.xml
+++ b/distro/src/main/assembly/hive-agent.xml
@@ -43,8 +43,6 @@
org.apache.ranger:ranger-audit-core
org.apache.ranger:ranger-audit-dest-auditserver
- org.apache.ranger:ranger-audit-dest-hdfs
- org.apache.ranger:ranger-audit-dest-solr
org.apache.ranger:ranger-authz-api
org.apache.ranger:ranger-common-utils
org.apache.ranger:ranger-plugins-cred
diff --git a/distro/src/main/assembly/kms.xml b/distro/src/main/assembly/kms.xml
index 1c9472889f5..c786761a010 100755
--- a/distro/src/main/assembly/kms.xml
+++ b/distro/src/main/assembly/kms.xml
@@ -291,8 +291,6 @@
org.apache.ranger:ranger-audit-core
org.apache.ranger:ranger-audit-dest-auditserver
- org.apache.ranger:ranger-audit-dest-hdfs
- org.apache.ranger:ranger-audit-dest-solr
org.apache.ranger:ranger-authz-api
org.apache.ranger:ranger-common-utils
org.apache.ranger:ranger-plugins-cred
diff --git a/distro/src/main/assembly/knox-agent.xml b/distro/src/main/assembly/knox-agent.xml
index a15036e4130..dacc7fb7653 100644
--- a/distro/src/main/assembly/knox-agent.xml
+++ b/distro/src/main/assembly/knox-agent.xml
@@ -44,8 +44,6 @@
org.apache.ranger:ranger-audit-core
org.apache.ranger:ranger-audit-dest-auditserver
- org.apache.ranger:ranger-audit-dest-hdfs
- org.apache.ranger:ranger-audit-dest-solr
org.apache.ranger:ranger-authz-api
org.apache.ranger:ranger-common-utils
org.apache.ranger:ranger-plugins-cred
diff --git a/distro/src/main/assembly/pdp.xml b/distro/src/main/assembly/pdp.xml
index f5a0a66c25e..d51f70bce03 100644
--- a/distro/src/main/assembly/pdp.xml
+++ b/distro/src/main/assembly/pdp.xml
@@ -33,8 +33,6 @@
org.apache.ranger:authz-embedded
org.apache.ranger:ranger-audit-core
org.apache.ranger:ranger-audit-dest-auditserver
- org.apache.ranger:ranger-audit-dest-hdfs
- org.apache.ranger:ranger-audit-dest-solr
org.apache.ranger:ranger-authn
org.apache.ranger:ranger-authz-api
org.apache.ranger:ranger-common-utils
diff --git a/distro/src/main/assembly/plugin-atlas.xml b/distro/src/main/assembly/plugin-atlas.xml
index adfe237e150..f4c770f814a 100644
--- a/distro/src/main/assembly/plugin-atlas.xml
+++ b/distro/src/main/assembly/plugin-atlas.xml
@@ -44,8 +44,6 @@
org.apache.ranger:ranger-audit-core
org.apache.ranger:ranger-audit-dest-auditserver
- org.apache.ranger:ranger-audit-dest-hdfs
- org.apache.ranger:ranger-audit-dest-solr
org.apache.ranger:ranger-authz-api
org.apache.ranger:ranger-common-utils
org.apache.ranger:ranger-plugins-cred
diff --git a/distro/src/main/assembly/plugin-elasticsearch.xml b/distro/src/main/assembly/plugin-elasticsearch.xml
index cfb72d20aa8..156a2667b23 100644
--- a/distro/src/main/assembly/plugin-elasticsearch.xml
+++ b/distro/src/main/assembly/plugin-elasticsearch.xml
@@ -48,8 +48,6 @@
org.apache.ranger:ranger-audit-core
org.apache.ranger:ranger-audit-dest-auditserver
- org.apache.ranger:ranger-audit-dest-es
- org.apache.ranger:ranger-audit-dest-hdfs
org.apache.ranger:ranger-authz-api
org.apache.ranger:ranger-common-utils
org.apache.ranger:ranger-plugins-cred
diff --git a/distro/src/main/assembly/plugin-kafka.xml b/distro/src/main/assembly/plugin-kafka.xml
index f79cf7e4328..2216588b782 100644
--- a/distro/src/main/assembly/plugin-kafka.xml
+++ b/distro/src/main/assembly/plugin-kafka.xml
@@ -39,8 +39,6 @@
org.apache.ranger:ranger-audit-core
org.apache.ranger:ranger-audit-dest-auditserver
- org.apache.ranger:ranger-audit-dest-hdfs
- org.apache.ranger:ranger-audit-dest-solr
org.apache.ranger:ranger-authz-api
org.apache.ranger:ranger-common-utils
org.apache.ranger:ranger-kafka-plugin
diff --git a/distro/src/main/assembly/plugin-kms.xml b/distro/src/main/assembly/plugin-kms.xml
index aab96deb5de..6ac8c270da5 100755
--- a/distro/src/main/assembly/plugin-kms.xml
+++ b/distro/src/main/assembly/plugin-kms.xml
@@ -43,8 +43,6 @@
org.apache.ranger:ranger-audit-core
org.apache.ranger:ranger-audit-dest-auditserver
- org.apache.ranger:ranger-audit-dest-hdfs
- org.apache.ranger:ranger-audit-dest-solr
org.apache.ranger:ranger-authz-api
org.apache.ranger:ranger-common-utils
org.apache.ranger:ranger-plugins-cred
diff --git a/distro/src/main/assembly/plugin-kylin.xml b/distro/src/main/assembly/plugin-kylin.xml
index 0d52c90054e..de0fad01fc8 100644
--- a/distro/src/main/assembly/plugin-kylin.xml
+++ b/distro/src/main/assembly/plugin-kylin.xml
@@ -43,8 +43,6 @@
org.apache.ranger:ranger-audit-core
org.apache.ranger:ranger-audit-dest-auditserver
- org.apache.ranger:ranger-audit-dest-hdfs
- org.apache.ranger:ranger-audit-dest-solr
org.apache.ranger:ranger-authz-api
org.apache.ranger:ranger-common-utils
org.apache.ranger:ranger-plugins-cred
diff --git a/distro/src/main/assembly/plugin-ozone.xml b/distro/src/main/assembly/plugin-ozone.xml
index ec43244cd18..e3c1ca011eb 100644
--- a/distro/src/main/assembly/plugin-ozone.xml
+++ b/distro/src/main/assembly/plugin-ozone.xml
@@ -72,8 +72,6 @@
org.apache.ranger:ranger-audit-core
org.apache.ranger:ranger-audit-dest-auditserver
- org.apache.ranger:ranger-audit-dest-hdfs
- org.apache.ranger:ranger-audit-dest-solr
org.apache.ranger:ranger-authz-api
org.apache.ranger:ranger-common-utils
org.apache.ranger:ranger-plugins-cred
diff --git a/distro/src/main/assembly/plugin-presto.xml b/distro/src/main/assembly/plugin-presto.xml
index 6b38a449843..1a3627900d0 100644
--- a/distro/src/main/assembly/plugin-presto.xml
+++ b/distro/src/main/assembly/plugin-presto.xml
@@ -54,8 +54,6 @@
org.apache.ranger:ranger-audit-core
org.apache.ranger:ranger-audit-dest-auditserver
- org.apache.ranger:ranger-audit-dest-hdfs
- org.apache.ranger:ranger-audit-dest-solr
org.apache.ranger:ranger-authz-api
org.apache.ranger:ranger-common-utils
org.apache.ranger:ranger-plugins-cred
diff --git a/distro/src/main/assembly/plugin-solr.xml b/distro/src/main/assembly/plugin-solr.xml
index 97975beac47..a478e27a460 100644
--- a/distro/src/main/assembly/plugin-solr.xml
+++ b/distro/src/main/assembly/plugin-solr.xml
@@ -38,8 +38,6 @@
org.apache.ranger:ranger-audit-core
org.apache.ranger:ranger-audit-dest-auditserver
- org.apache.ranger:ranger-audit-dest-hdfs
- org.apache.ranger:ranger-audit-dest-solr
org.apache.ranger:ranger-authz-api
org.apache.ranger:ranger-common-utils
org.apache.ranger:ranger-plugins-cred
diff --git a/distro/src/main/assembly/plugin-sqoop.xml b/distro/src/main/assembly/plugin-sqoop.xml
index e5e90851d21..430fffd928b 100644
--- a/distro/src/main/assembly/plugin-sqoop.xml
+++ b/distro/src/main/assembly/plugin-sqoop.xml
@@ -43,8 +43,6 @@
org.apache.ranger:ranger-audit-core
org.apache.ranger:ranger-audit-dest-auditserver
- org.apache.ranger:ranger-audit-dest-hdfs
- org.apache.ranger:ranger-audit-dest-solr
org.apache.ranger:ranger-authz-api
org.apache.ranger:ranger-common-utils
org.apache.ranger:ranger-plugins-cred
diff --git a/distro/src/main/assembly/plugin-trino.xml b/distro/src/main/assembly/plugin-trino.xml
index 7512199242b..7ab6ad42169 100644
--- a/distro/src/main/assembly/plugin-trino.xml
+++ b/distro/src/main/assembly/plugin-trino.xml
@@ -28,8 +28,6 @@
org.apache.ranger:ranger-audit-core
org.apache.ranger:ranger-audit-dest-auditserver
- org.apache.ranger:ranger-audit-dest-hdfs
- org.apache.ranger:ranger-audit-dest-solr
org.apache.ranger:ranger-authz-api
org.apache.ranger:ranger-common-utils
org.apache.ranger:ranger-plugins-cred
diff --git a/distro/src/main/assembly/plugin-yarn.xml b/distro/src/main/assembly/plugin-yarn.xml
index 52f6335ae67..a4fc902e593 100644
--- a/distro/src/main/assembly/plugin-yarn.xml
+++ b/distro/src/main/assembly/plugin-yarn.xml
@@ -43,8 +43,6 @@
org.apache.ranger:ranger-audit-core
org.apache.ranger:ranger-audit-dest-auditserver
- org.apache.ranger:ranger-audit-dest-hdfs
- org.apache.ranger:ranger-audit-dest-solr
org.apache.ranger:ranger-authz-api
org.apache.ranger:ranger-common-utils
org.apache.ranger:ranger-plugins-cred
diff --git a/distro/src/main/assembly/storm-agent.xml b/distro/src/main/assembly/storm-agent.xml
index 027a2a47fe4..0dbc49cd6c9 100644
--- a/distro/src/main/assembly/storm-agent.xml
+++ b/distro/src/main/assembly/storm-agent.xml
@@ -43,8 +43,6 @@
org.apache.ranger:ranger-audit-core
org.apache.ranger:ranger-audit-dest-auditserver
- org.apache.ranger:ranger-audit-dest-hdfs
- org.apache.ranger:ranger-audit-dest-solr
org.apache.ranger:ranger-authz-api
org.apache.ranger:ranger-common-utils
org.apache.ranger:ranger-plugins-cred
diff --git a/hbase-agent/pom.xml b/hbase-agent/pom.xml
index b4af771536a..2b9412483b3 100644
--- a/hbase-agent/pom.xml
+++ b/hbase-agent/pom.xml
@@ -226,22 +226,6 @@
ranger-audit-dest-auditserver
${project.version}
-
- org.apache.ranger
- ranger-audit-dest-hdfs
- ${project.version}
-
-
- org.apache.hadoop
- *
-
-
-
-
- org.apache.ranger
- ranger-audit-dest-solr
- ${project.version}
-
org.apache.ranger
ranger-hbase-plugin-shim
diff --git a/hdfs-agent/pom.xml b/hdfs-agent/pom.xml
index 7b86beb37b7..c9392c272ea 100644
--- a/hdfs-agent/pom.xml
+++ b/hdfs-agent/pom.xml
@@ -188,16 +188,6 @@
ranger-audit-dest-auditserver
${project.version}
-
- org.apache.ranger
- ranger-audit-dest-hdfs
- ${project.version}
-
-
- org.apache.ranger
- ranger-audit-dest-solr
- ${project.version}
-
org.apache.ranger
ranger-plugins-common
diff --git a/hive-agent/pom.xml b/hive-agent/pom.xml
index 3bf1b0deb00..95a7b4dca20 100644
--- a/hive-agent/pom.xml
+++ b/hive-agent/pom.xml
@@ -283,16 +283,6 @@
ranger-audit-dest-auditserver
${project.version}
-
- org.apache.ranger
- ranger-audit-dest-hdfs
- ${project.version}
-
-
- org.apache.ranger
- ranger-audit-dest-solr
- ${project.version}
-
org.apache.ranger
ranger-plugins-common
diff --git a/knox-agent/pom.xml b/knox-agent/pom.xml
index 4b7a3cd7dc8..faade88ad24 100644
--- a/knox-agent/pom.xml
+++ b/knox-agent/pom.xml
@@ -121,22 +121,6 @@
ranger-audit-dest-auditserver
${project.version}
-
- org.apache.ranger
- ranger-audit-dest-hdfs
- ${project.version}
-
-
-
- org.apache.ranger
- ranger-audit-dest-solr
- ${project.version}
-
-
org.apache.ranger
ranger-plugins-common
diff --git a/plugin-atlas/pom.xml b/plugin-atlas/pom.xml
index 2dc2c42e71b..a5b75315c3d 100644
--- a/plugin-atlas/pom.xml
+++ b/plugin-atlas/pom.xml
@@ -107,16 +107,6 @@
ranger-audit-dest-auditserver
${project.version}
-
- org.apache.ranger
- ranger-audit-dest-hdfs
- ${project.version}
-
-
- org.apache.ranger
- ranger-audit-dest-solr
- ${project.version}
-
org.apache.ranger
ranger-plugins-common
diff --git a/plugin-elasticsearch/pom.xml b/plugin-elasticsearch/pom.xml
index 8d8f360e375..5f90340f179 100644
--- a/plugin-elasticsearch/pom.xml
+++ b/plugin-elasticsearch/pom.xml
@@ -51,16 +51,6 @@
ranger-audit-dest-auditserver
${project.version}
-
- org.apache.ranger
- ranger-audit-dest-hdfs
- ${project.version}
-
-
- org.apache.ranger
- ranger-audit-dest-solr
- ${project.version}
-
org.apache.ranger
ranger-plugins-common
diff --git a/plugin-kafka/pom.xml b/plugin-kafka/pom.xml
index d925a721ba8..e60ac36735b 100644
--- a/plugin-kafka/pom.xml
+++ b/plugin-kafka/pom.xml
@@ -81,16 +81,6 @@
ranger-audit-dest-auditserver
${project.version}
-
- org.apache.ranger
- ranger-audit-dest-hdfs
- ${project.version}
-
-
- org.apache.ranger
- ranger-audit-dest-solr
- ${project.version}
-
org.apache.ranger
ranger-plugins-common
diff --git a/plugin-kms/pom.xml b/plugin-kms/pom.xml
index eb9aad4e9cc..88aae6ae662 100644
--- a/plugin-kms/pom.xml
+++ b/plugin-kms/pom.xml
@@ -56,16 +56,6 @@
ranger-audit-dest-auditserver
${project.version}
-
- org.apache.ranger
- ranger-audit-dest-hdfs
- ${project.version}
-
-
- org.apache.ranger
- ranger-audit-dest-solr
- ${project.version}
-
org.apache.ranger
ranger-kms
diff --git a/plugin-kudu/pom.xml b/plugin-kudu/pom.xml
index f4342663a86..019ce2311fd 100644
--- a/plugin-kudu/pom.xml
+++ b/plugin-kudu/pom.xml
@@ -41,16 +41,6 @@
ranger-audit-dest-auditserver
${project.version}
-
- org.apache.ranger
- ranger-audit-dest-hdfs
- ${project.version}
-
-
- org.apache.ranger
- ranger-audit-dest-solr
- ${project.version}
-
org.apache.ranger
ranger-plugins-common
diff --git a/plugin-kylin/pom.xml b/plugin-kylin/pom.xml
index 51100073a23..483bf6eb016 100644
--- a/plugin-kylin/pom.xml
+++ b/plugin-kylin/pom.xml
@@ -62,16 +62,6 @@
ranger-audit-dest-auditserver
${project.version}
-
- org.apache.ranger
- ranger-audit-dest-hdfs
- ${project.version}
-
-
- org.apache.ranger
- ranger-audit-dest-solr
- ${project.version}
-
org.apache.ranger
ranger-plugins-common
diff --git a/plugin-nifi-registry/pom.xml b/plugin-nifi-registry/pom.xml
index e38278ea5c2..5d4f913124d 100644
--- a/plugin-nifi-registry/pom.xml
+++ b/plugin-nifi-registry/pom.xml
@@ -72,16 +72,6 @@
ranger-audit-dest-auditserver
${project.version}
-
- org.apache.ranger
- ranger-audit-dest-hdfs
- ${project.version}
-
-
- org.apache.ranger
- ranger-audit-dest-solr
- ${project.version}
-
org.apache.ranger
ranger-plugins-common
diff --git a/plugin-nifi/pom.xml b/plugin-nifi/pom.xml
index 48bf81e9b44..27242d980ea 100644
--- a/plugin-nifi/pom.xml
+++ b/plugin-nifi/pom.xml
@@ -62,16 +62,6 @@
ranger-audit-dest-auditserver
${project.version}
-
- org.apache.ranger
- ranger-audit-dest-hdfs
- ${project.version}
-
-
- org.apache.ranger
- ranger-audit-dest-solr
- ${project.version}
-
org.apache.ranger
ranger-plugins-common
diff --git a/plugin-ozone/pom.xml b/plugin-ozone/pom.xml
index 0aa9f7f3ac2..d0cb16f8eb3 100644
--- a/plugin-ozone/pom.xml
+++ b/plugin-ozone/pom.xml
@@ -115,16 +115,6 @@ limitations under the License.
ranger-audit-dest-auditserver
${project.version}
-
- org.apache.ranger
- ranger-audit-dest-hdfs
- ${project.version}
-
-
- org.apache.ranger
- ranger-audit-dest-solr
- ${project.version}
-
org.apache.ranger
ranger-plugins-common
diff --git a/plugin-presto/pom.xml b/plugin-presto/pom.xml
index 9c28c1cb900..942dfdbe68c 100644
--- a/plugin-presto/pom.xml
+++ b/plugin-presto/pom.xml
@@ -66,16 +66,6 @@
ranger-audit-dest-auditserver
${project.version}
-
- org.apache.ranger
- ranger-audit-dest-hdfs
- ${project.version}
-
-
- org.apache.ranger
- ranger-audit-dest-solr
- ${project.version}
-
org.apache.ranger
ranger-plugins-common
diff --git a/plugin-solr/pom.xml b/plugin-solr/pom.xml
index 863027c535c..5d4d9f25735 100644
--- a/plugin-solr/pom.xml
+++ b/plugin-solr/pom.xml
@@ -72,16 +72,6 @@
ranger-audit-dest-auditserver
${project.version}
-
- org.apache.ranger
- ranger-audit-dest-hdfs
- ${project.version}
-
-
- org.apache.ranger
- ranger-audit-dest-solr
- ${project.version}
-
org.apache.ranger
ranger-plugins-common
diff --git a/plugin-sqoop/pom.xml b/plugin-sqoop/pom.xml
index b73b4a15429..169a5b07ccf 100644
--- a/plugin-sqoop/pom.xml
+++ b/plugin-sqoop/pom.xml
@@ -62,16 +62,6 @@
ranger-audit-dest-auditserver
${project.version}
-
- org.apache.ranger
- ranger-audit-dest-hdfs
- ${project.version}
-
-
- org.apache.ranger
- ranger-audit-dest-solr
- ${project.version}
-
org.apache.ranger
ranger-plugins-common
diff --git a/plugin-trino/pom.xml b/plugin-trino/pom.xml
index 15f6d2dba3b..6b6d5094938 100644
--- a/plugin-trino/pom.xml
+++ b/plugin-trino/pom.xml
@@ -107,16 +107,6 @@
ranger-audit-dest-auditserver
${project.version}
-
- org.apache.ranger
- ranger-audit-dest-hdfs
- ${project.version}
-
-
- org.apache.ranger
- ranger-audit-dest-solr
- ${project.version}
-
org.apache.ranger
ranger-plugins-common
diff --git a/plugin-yarn/pom.xml b/plugin-yarn/pom.xml
index d4035a57644..5d3629a9d68 100644
--- a/plugin-yarn/pom.xml
+++ b/plugin-yarn/pom.xml
@@ -104,16 +104,6 @@
ranger-audit-dest-auditserver
${project.version}
-
- org.apache.ranger
- ranger-audit-dest-hdfs
- ${project.version}
-
-
- org.apache.ranger
- ranger-audit-dest-solr
- ${project.version}
-
org.apache.ranger
ranger-plugins-common
diff --git a/ranger-examples/plugin-sampleapp/pom.xml b/ranger-examples/plugin-sampleapp/pom.xml
index 8e8e5c338d9..033f355174c 100644
--- a/ranger-examples/plugin-sampleapp/pom.xml
+++ b/ranger-examples/plugin-sampleapp/pom.xml
@@ -87,16 +87,6 @@
ranger-audit-dest-auditserver
${project.version}
-
- org.apache.ranger
- ranger-audit-dest-hdfs
- ${project.version}
-
-
- org.apache.ranger
- ranger-audit-dest-solr
- ${project.version}
-
org.apache.ranger
ranger-plugins-common